Merge pull request #21685 from mayflower/fix/bind-outputs

bind: fix collision of binaries in outputs

Changed files
+4 -5
nixos
modules
services
networking
pkgs
servers
dns
+1 -1
nixos/modules/services/networking/bind.nix
···
chown ${bindUser} /var/run/named
'';
-
script = "${pkgs.bind.bin}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
+
script = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
unitConfig.Documentation = "man:named(8)";
};
};
+3 -4
pkgs/servers/dns/bind/default.nix
···
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;
···
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'
···
maintainers = with stdenv.lib.maintainers; [viric peti];
platforms = with stdenv.lib.platforms; unix;
+
+
outputsToInstall = [ "out" "dnsutils" "host" ];
};
}