summary refs log tree commit diff
path: root/pkgs/os-specific/linux/tcp-wrappers
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-04-23 13:56:08 -0500
committerWill Dietz <w@wdtz.org>2018-04-24 17:24:39 -0500
commit092a4fff400a06d2b82b8fb9722bcc05c9e89566 (patch)
treea2b92bc094530bf4306d1d5e7ca5daed1e2e83f1 /pkgs/os-specific/linux/tcp-wrappers
parenta4585468d17466d6e77fd2f5aaab31ac772bac01 (diff)
downloadnixpkgs-092a4fff400a06d2b82b8fb9722bcc05c9e89566.tar
nixpkgs-092a4fff400a06d2b82b8fb9722bcc05c9e89566.tar.gz
nixpkgs-092a4fff400a06d2b82b8fb9722bcc05c9e89566.tar.bz2
nixpkgs-092a4fff400a06d2b82b8fb9722bcc05c9e89566.tar.lz
nixpkgs-092a4fff400a06d2b82b8fb9722bcc05c9e89566.tar.xz
nixpkgs-092a4fff400a06d2b82b8fb9722bcc05c9e89566.tar.zst
nixpkgs-092a4fff400a06d2b82b8fb9722bcc05c9e89566.zip
tcp-wrappers: rename conflicting variable instead of clearing it
Diffstat (limited to 'pkgs/os-specific/linux/tcp-wrappers')
-rw-r--r--pkgs/os-specific/linux/tcp-wrappers/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix
index 7da4e39ca6c..667189009cc 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/default.nix
+++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix
@@ -20,11 +20,14 @@ in stdenv.mkDerivation rec {
   prePatch = ''
     tar -xaf $debian
     patches="$(cat debian/patches/series | sed 's,^,debian/patches/,') $patches"
+
+    substituteInPlace Makefile --replace STRINGS STRINGDEFS
+    substituteInPlace debian/patches/13_shlib_weaksym --replace STRINGS STRINGDEFS
   '';
 
   buildInputs = [ libnsl ];
 
-  makeFlags = [ "STRINGS=" "REAL_DAEMON_DIR=$(out)/bin" "linux" ];
+  makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ];
 
   installPhase = ''
     mkdir -p "$out/bin"