From ec4bdc860ebf020983d8eb5e8be8a05ed0a7c52b Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 14 Mar 2019 12:59:21 -0400
Subject: [PATCH] nsis: use zlib outputs directly

---
 pkgs/development/tools/nsis/default.nix | 11 ++++-------
 1 file 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"
   ];