diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-01-05 19:58:26 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-01-07 02:44:54 +0100 |
commit | e6708cea37b86b59cc5b35e434b4711bdbbe5064 (patch) | |
tree | 4b3daea5b89f992312b7f43c397b779f4be4ead1 /pkgs/servers/dns/bind | |
parent | 56cceca9993f9f3d69dede4eb2083e9be289d257 (diff) | |
download | nixlib-e6708cea37b86b59cc5b35e434b4711bdbbe5064.tar nixlib-e6708cea37b86b59cc5b35e434b4711bdbbe5064.tar.gz nixlib-e6708cea37b86b59cc5b35e434b4711bdbbe5064.tar.bz2 nixlib-e6708cea37b86b59cc5b35e434b4711bdbbe5064.tar.lz nixlib-e6708cea37b86b59cc5b35e434b4711bdbbe5064.tar.xz nixlib-e6708cea37b86b59cc5b35e434b4711bdbbe5064.tar.zst nixlib-e6708cea37b86b59cc5b35e434b4711bdbbe5064.zip |
bind: fix collision of binaries in outputs
Using outputsToInstall the intended behaviour of including host and dnsutils when bind is installed can be implemented instead of using symlinks to fix installing all outputs individually with nix-env. Fixes #19761.
Diffstat (limited to 'pkgs/servers/dns/bind')
-rw-r--r-- | pkgs/servers/dns/bind/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index e3f2364463ba..d3daad1e0cbc 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "11lxkb7d79c75scrs28q4xmr0ii2li69zj1c650al3qxir8yf754"; }; - outputs = [ "bin" "lib" "dev" "out" "man" "dnsutils" "host" ]; + outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; @@ -40,13 +40,10 @@ stdenv.mkDerivation rec { moveToOutput bin/isc-config.sh $dev moveToOutput bin/host $host - ln -sf $host/bin/host $bin/bin moveToOutput bin/dig $dnsutils moveToOutput bin/nslookup $dnsutils moveToOutput bin/nsupdate $dnsutils - ln -sf $dnsutils/bin/{dig,nslookup,nsupdate} $bin/bin - ln -sf $host/bin/host $dnsutils/bin for f in "$lib/lib/"*.la "$dev/bin/"{isc-config.sh,bind*-config}; do sed -i "$f" -e 's|-L${openssl.dev}|-L${openssl.out}|g' @@ -60,5 +57,7 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [viric peti]; platforms = with stdenv.lib.platforms; unix; + + outputsToInstall = [ "out" "dnsutils" "host" ]; }; } |