diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-03-14 12:59:21 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-03-14 12:59:38 -0400 |
| commit | ec4bdc860ebf020983d8eb5e8be8a05ed0a7c52b (patch) | |
| tree | 17e6a531d2b25cb8981e230d9055733f96b33a40 /pkgs/development/tools/nsis | |
| parent | f929120b1b6226d4baaa6e4836e1a429d9a74470 (diff) | |
| download | nixpkgs-ec4bdc860ebf020983d8eb5e8be8a05ed0a7c52b.tar nixpkgs-ec4bdc860ebf020983d8eb5e8be8a05ed0a7c52b.tar.gz nixpkgs-ec4bdc860ebf020983d8eb5e8be8a05ed0a7c52b.tar.bz2 nixpkgs-ec4bdc860ebf020983d8eb5e8be8a05ed0a7c52b.tar.lz nixpkgs-ec4bdc860ebf020983d8eb5e8be8a05ed0a7c52b.tar.xz nixpkgs-ec4bdc860ebf020983d8eb5e8be8a05ed0a7c52b.tar.zst nixpkgs-ec4bdc860ebf020983d8eb5e8be8a05ed0a7c52b.zip | |
nsis: use zlib outputs directly
Diffstat (limited to 'pkgs/development/tools/nsis')
| -rw-r--r-- | pkgs/development/tools/nsis/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index ea2fa073e07..f839223f729 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -1,9 +1,6 @@ -{ stdenv, symlinkJoin, fetchurl, fetchzip, scons, zlib }: +{ stdenv, fetchurl, fetchzip, scons, zlib }: -let - ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib zlib.dev ]; }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "nsis-${version}"; version = "3.04"; @@ -32,8 +29,8 @@ in stdenv.mkDerivation rec { "SKIPPLUGINS=all" "SKIPUTILS=all" "SKIPMISC=all" - "APPEND_CPPPATH=${ZLIB_HOME}/include" - "APPEND_LIBPATH=${ZLIB_HOME}/lib" + "APPEND_CPPPATH=${zlib.dev}/include" + "APPEND_LIBPATH=${zlib}/lib" "NSIS_CONFIG_CONST_DATA=no" ]; |