Merge pull request #195010 from wegank/survex-1.4.3

survex: 1.4.1 -> 1.4.3

authored by

Stanisław Pitucha and committed by
GitHub
1e18a51e d1dcdeeb

+17 -10
+17 -10
pkgs/applications/misc/survex/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchurl 4 + , fetchpatch 4 5 , Carbon 5 6 , Cocoa 6 7 , ffmpeg ··· 12 13 , proj 13 14 , python3 14 15 , wrapGAppsHook 15 - , wxGTK30-gtk3 16 - , wxmac 16 + , wxGTK32 17 17 , xlibsWrapper 18 18 }: 19 19 20 20 stdenv.mkDerivation rec { 21 21 pname = "survex"; 22 - version = "1.4.1"; 22 + version = "1.4.3"; 23 + 24 + src = fetchurl { 25 + url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz"; 26 + hash = "sha256-7NtGTe9xNRPEvG9fQ2fC6htQLEMHfqGmBM2ezhi6oNM="; 27 + }; 28 + 29 + patches = [ 30 + # Fix cavern.tst to work with SOURCE_DATE_EPOCH set 31 + (fetchpatch { 32 + url = "https://github.com/ojwb/survex/commit/b1200a60be7bdea20ffebbd8bb15386041727fa6.patch"; 33 + hash = "sha256-OtFjqpU+u8XGy+PAHg2iea++b681p/Kl8YslisBs4sA="; 34 + }) 35 + ]; 23 36 24 37 nativeBuildInputs = [ 25 38 perl ··· 34 47 libGLU 35 48 mesa 36 49 proj 50 + wxGTK32 37 51 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 38 52 Carbon 39 53 Cocoa 40 - wxmac 41 54 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ 42 - wxGTK30-gtk3 43 55 xlibsWrapper 44 56 ]; 45 - 46 - src = fetchurl { 47 - url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz"; 48 - hash = "sha256-69X1jGjBTQIQzkD1mTZTzE8L/GXnnf5SI52l7eIiLz4="; 49 - }; 50 57 51 58 postPatch = '' 52 59 patchShebangs .