colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nsis: use zlib outputs directly

Browse Source
This commit is contained in:
Dmitry Kalinkin 2019-03-14 12:59:21 -04:00
parent f929120b1b
commit ec4bdc860e
No known key found for this signature in database
GPG Key ID: 06AF1D3C38F04E0E
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/nsis/default.nix
View File

@ -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"
];