Merge pull request #195010 from wegank/survex-1.4.3
survex: 1.4.1 -> 1.4.3
This commit is contained in:
commit
1e18a51ef1
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, ffmpeg
|
||||
@ -12,14 +13,26 @@
|
||||
, proj
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, wxGTK30-gtk3
|
||||
, wxmac
|
||||
, wxGTK32
|
||||
, xlibsWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "survex";
|
||||
version = "1.4.1";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-7NtGTe9xNRPEvG9fQ2fC6htQLEMHfqGmBM2ezhi6oNM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix cavern.tst to work with SOURCE_DATE_EPOCH set
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ojwb/survex/commit/b1200a60be7bdea20ffebbd8bb15386041727fa6.patch";
|
||||
hash = "sha256-OtFjqpU+u8XGy+PAHg2iea++b681p/Kl8YslisBs4sA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl
|
||||
@ -34,20 +47,14 @@ stdenv.mkDerivation rec {
|
||||
libGLU
|
||||
mesa
|
||||
proj
|
||||
wxGTK32
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
Carbon
|
||||
Cocoa
|
||||
wxmac
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
wxGTK30-gtk3
|
||||
xlibsWrapper
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-69X1jGjBTQIQzkD1mTZTzE8L/GXnnf5SI52l7eIiLz4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user