diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:28 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:28 +0000 |
| commit | a111b5fde4af9c73861307225496521d5bef0a27 (patch) | |
| tree | a3444211ee4e29b73810629399ca963986616fb9 | |
| parent | be79fc5c331280732d0fbcf8a7a5eed3b69e1e01 (diff) | |
| download | nixpkgs-a111b5fde4af9c73861307225496521d5bef0a27.tar nixpkgs-a111b5fde4af9c73861307225496521d5bef0a27.tar.gz nixpkgs-a111b5fde4af9c73861307225496521d5bef0a27.tar.bz2 nixpkgs-a111b5fde4af9c73861307225496521d5bef0a27.tar.lz nixpkgs-a111b5fde4af9c73861307225496521d5bef0a27.tar.xz nixpkgs-a111b5fde4af9c73861307225496521d5bef0a27.tar.zst nixpkgs-a111b5fde4af9c73861307225496521d5bef0a27.zip | |
bind: move defaults to package file
| -rw-r--r-- | pkgs/servers/dns/bind/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 74e1fda2d42..550a8fa13cc 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl +{ config, stdenv, lib, fetchurl , perl , libcap, libtool, libxml2, openssl -, enablePython ? false, python3 ? null +, enablePython ? config.bind.enablePython or false, python3 ? null , enableSeccomp ? false, libseccomp ? null, buildPackages }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool libxml2 openssl ] ++ lib.optional stdenv.isLinux libcap ++ lib.optional enableSeccomp libseccomp - ++ lib.optional enablePython python3; + ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ])); STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e7bfd67914..357cad38470 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13446,10 +13446,7 @@ in bftpd = callPackage ../servers/ftp/bftpd {}; - bind = callPackage ../servers/dns/bind { - enablePython = config.bind.enablePython or false; - python3 = python3.withPackages (ps: with ps; [ ply ]); - }; + bind = callPackage ../servers/dns/bind { }; dnsutils = bind.dnsutils; inherit (callPackages ../servers/bird { }) |