Revert "dnsutils: Add smaller derivation of bind"

This reverts commit bb6ac771c4.
This commit is contained in:
Eelco Dolstra 2015-06-01 21:35:41 +02:00
parent 0a4de71cb0
commit 4fdf489073
2 changed files with 10 additions and 28 deletions

View file

@ -7,19 +7,15 @@
# Optional DLZ Modules
, postgresql ? null, libmysql ? null, db ? null, openldap ? null
# Extra arguments
, suffix ? ""
}:
assert postgresql != null;
with stdenv;
let
version = "9.10.2";
toolsOnly = suffix == "tools";
optLibseccomp = shouldUsePkg libseccomp;
optPython = if toolsOnly then null else shouldUsePkg python;
optPython = shouldUsePkg python;
optKerberos = shouldUsePkg kerberos;
optOpenssl = shouldUsePkg openssl;
optLibxml2 = shouldUsePkg libxml2;
@ -29,19 +25,18 @@ let
optIdnkit = shouldUsePkg idnkit;
optLibiconv = shouldUsePkg libiconv;
optPostgresql = if toolsOnly then null else shouldUsePkg postgresql;
optLibmysql = if toolsOnly then null else shouldUsePkg libmysql;
optDb = if toolsOnly then null else shouldUsePkg db;
optOpenldap = if toolsOnly then null else shouldUsePkg openldap;
pythonBin = if optPython == null then null else "${optPython}/bin/python";
optPostgresql = shouldUsePkg postgresql;
optLibmysql = shouldUsePkg libmysql;
optDb = shouldUsePkg db;
optOpenldap = shouldUsePkg openldap;
in
assert optPostgresql != null;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "bind${optionalString (suffix != "") "-${suffix}"}-${version}";
name = "bind-${version}";
src = fetchurl {
url = "http://ftp.isc.org/isc/bind9/${version}/bind-${version}.tar.gz";
url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
sha256 = "163s8pvqj4lyryvfzkc6acbys7gw1by5dqwilggiwp54ia8bg6vg";
};
@ -60,7 +55,7 @@ stdenv.mkDerivation rec {
(mkOther "localstatedir" "/var")
(mkOther "sysconfdir" "/etc")
(mkEnable (optLibseccomp != null) "seccomp" null)
(mkWith (optPython != null) "python" pythonBin)
(mkWith (optPython != null) "python" "${optPython}/bin/python")
(mkEnable true "kqueue" null)
(mkEnable true "epoll" null)
(mkEnable true "devpoll" null)
@ -114,18 +109,8 @@ stdenv.mkDerivation rec {
installFlags = [
"sysconfdir=\${out}/etc"
"localstatedir=\${TMPDIR}"
] ++ optionals toolsOnly [
"DESTDIR=\${TMPDIR}"
];
postInstall = optionalString toolsOnly ''
mkdir -p $out/{bin,etc,lib,share/man/man1}
install -m 0755 $TMPDIR/$out/bin/{dig,nslookup,nsupdate} $out/bin
install -m 0644 $TMPDIR/$out/etc/bind.keys $out/etc
install -m 0644 $TMPDIR/$out/lib/*.so.* $out/lib
install -m 0644 $TMPDIR/$out/share/man/man1/{dig,nslookup,nsupdate}.1 $out/share/man/man1
'';
enableParallelBuilding = true;
meta = {

View file

@ -8642,9 +8642,6 @@ let
sabnzbd = callPackage ../servers/sabnzbd { };
bind = callPackage ../servers/dns/bind { };
dnsutils = bind.override {
suffix = "tools";
};
bird = callPackage ../servers/bird { };