Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

tcp-wrappers: rename conflicting variable instead of clearing it

+4 -1
+4 -1
pkgs/os-specific/linux/tcp-wrappers/default.nix
··· 20 prePatch = '' 21 tar -xaf $debian 22 patches="$(cat debian/patches/series | sed 's,^,debian/patches/,') $patches" 23 ''; 24 25 buildInputs = [ libnsl ]; 26 27 - makeFlags = [ "STRINGS=" "REAL_DAEMON_DIR=$(out)/bin" "linux" ]; 28 29 installPhase = '' 30 mkdir -p "$out/bin"
··· 20 prePatch = '' 21 tar -xaf $debian 22 patches="$(cat debian/patches/series | sed 's,^,debian/patches/,') $patches" 23 + 24 + substituteInPlace Makefile --replace STRINGS STRINGDEFS 25 + substituteInPlace debian/patches/13_shlib_weaksym --replace STRINGS STRINGDEFS 26 ''; 27 28 buildInputs = [ libnsl ]; 29 30 + makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ]; 31 32 installPhase = '' 33 mkdir -p "$out/bin"