diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
| commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
| tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/development/tools/nsis | |
| parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
| parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
| download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip | |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/development/tools/nsis')
| -rw-r--r-- | pkgs/development/tools/nsis/default.nix | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index 33be56c539d..4820d8bb4b7 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -1,8 +1,11 @@ -{ stdenv +{ lib +, stdenv +, symlinkJoin , fetchurl , fetchzip , sconsPackages , zlib +, libiconv }: stdenv.mkDerivation rec { @@ -28,30 +31,44 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ sconsPackages.scons_3_1_2 ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + + CPPPATH = symlinkJoin { + name = "nsis-includes"; + paths = [ zlib.dev ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + }; + + LIBPATH = symlinkJoin { + name = "nsis-libs"; + paths = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + }; sconsFlags = [ "SKIPSTUBS=all" "SKIPPLUGINS=all" "SKIPUTILS=all" "SKIPMISC=all" - "APPEND_CPPPATH=${zlib.dev}/include" - "APPEND_LIBPATH=${zlib}/lib" "NSIS_CONFIG_CONST_DATA=no" - ]; + ] ++ lib.optional stdenv.isDarwin "APPEND_LINKFLAGS=-liconv"; preBuild = '' - sconsFlagsArray+=("PATH=$PATH") + sconsFlagsArray+=( + "PATH=$PATH" + "CC=$CC" + "CXX=$CXX" + "APPEND_CPPPATH=$CPPPATH/include" + "APPEND_LIBPATH=$LIBPATH/lib" + ) ''; prefixKey = "PREFIX="; installTargets = [ "install-compiler" ]; - meta = with stdenv.lib; { - description = "NSIS is a free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge"; + meta = with lib; { + description = "A free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge"; homepage = "https://nsis.sourceforge.io/"; license = licenses.zlib; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ pombeirp ]; }; } |