survex: 1.4.1 -> 1.4.3
This commit is contained in:
parent
a989aa4619
commit
804100e6e1
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
|
, fetchpatch
|
||||||
, Carbon
|
, Carbon
|
||||||
, Cocoa
|
, Cocoa
|
||||||
, ffmpeg
|
, ffmpeg
|
||||||
|
@ -12,14 +13,26 @@
|
||||||
, proj
|
, proj
|
||||||
, python3
|
, python3
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, wxGTK30-gtk3
|
, wxGTK32
|
||||||
, wxmac
|
|
||||||
, xlibsWrapper
|
, xlibsWrapper
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "survex";
|
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 = [
|
nativeBuildInputs = [
|
||||||
perl
|
perl
|
||||||
|
@ -34,20 +47,14 @@ stdenv.mkDerivation rec {
|
||||||
libGLU
|
libGLU
|
||||||
mesa
|
mesa
|
||||||
proj
|
proj
|
||||||
|
wxGTK32
|
||||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
Carbon
|
Carbon
|
||||||
Cocoa
|
Cocoa
|
||||||
wxmac
|
|
||||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
wxGTK30-gtk3
|
|
||||||
xlibsWrapper
|
xlibsWrapper
|
||||||
];
|
];
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz";
|
|
||||||
hash = "sha256-69X1jGjBTQIQzkD1mTZTzE8L/GXnnf5SI52l7eIiLz4=";
|
|
||||||
};
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs .
|
patchShebangs .
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue