git.iko.soy/typeable/nixpkgs
on master help sign in
nsis: enable builds on darwin. (#120903)

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

commit0dde9ab531b503dbbdd2660780b94e5d64108832 authorMaisem Ali <3953239+maisem@users.noreply.github.com> dateThu 29 Apr 2021, 17:36 (6 years ago) parentf341831
1 file changed+24−7
pkgs/development/tools/nsis/default.nix+24−7
pkgs/development/tools/nsis/default.nix+24−7
@@ -1,8 +1,11 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
3+, symlinkJoin
24, fetchurl
35, fetchzip
46, sconsPackages
57, zlib
8+, libiconv
69}:
710
811stdenv.mkDerivation rec {
@@ -28,20 +31,34 @@ stdenv.mkDerivation rec {
2831 '';
2932
3033 nativeBuildInputs = [ sconsPackages.scons_3_1_2 ];
31− buildInputs = [ zlib ];
34+ buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
35+
36+ CPPPATH = symlinkJoin {
37+ name = "nsis-includes";
38+ paths = [ zlib.dev ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
39+ };
40+
41+ LIBPATH = symlinkJoin {
42+ name = "nsis-libs";
43+ paths = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
44+ };
3245
3346 sconsFlags = [
3447 "SKIPSTUBS=all"
3548 "SKIPPLUGINS=all"
3649 "SKIPUTILS=all"
3750 "SKIPMISC=all"
38− "APPEND_CPPPATH=${zlib.dev}/include"
39− "APPEND_LIBPATH=${zlib}/lib"
4051 "NSIS_CONFIG_CONST_DATA=no"
41− ];
52+ ] ++ lib.optional stdenv.isDarwin "APPEND_LINKFLAGS=-liconv";
4253
4354 preBuild = ''
44− sconsFlagsArray+=("PATH=$PATH")
55+ sconsFlagsArray+=(
56+ "PATH=$PATH"
57+ "CC=$CC"
58+ "CXX=$CXX"
59+ "APPEND_CPPPATH=$CPPPATH/include"
60+ "APPEND_LIBPATH=$LIBPATH/lib"
61+ )
4562 '';
4663
4764 prefixKey = "PREFIX=";
@@ -51,7 +68,7 @@ stdenv.mkDerivation rec {
5168 description = "A free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge";
5269 homepage = "https://nsis.sourceforge.io/";
5370 license = licenses.zlib;
54− platforms = platforms.linux;
71+ platforms = platforms.unix;
5572 maintainers = with maintainers; [ pombeirp ];
5673 };
5774}