JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bind: move defaults to package file

Browse Source
This commit is contained in:
Jan Malakhovski 2019-02-03 15:33:28 +00:00
parent be79fc5c33
commit a111b5fde4
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/dns/bind/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl { config, stdenv, lib, fetchurl
, perl , perl
, libcap, libtool, libxml2, openssl , libcap, libtool, libxml2, openssl
, enablePython ? false, python3 ? null , enablePython ? config.bind.enablePython or false, python3 ? null
, enableSeccomp ? false, libseccomp ? null, buildPackages , enableSeccomp ? false, libseccomp ? null, buildPackages
}: }:
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libtool libxml2 openssl ] buildInputs = [ libtool libxml2 openssl ]
++ lib.optional stdenv.isLinux libcap ++ lib.optional stdenv.isLinux libcap
++ lib.optional enableSeccomp libseccomp ++ lib.optional enableSeccomp libseccomp
++ lib.optional enablePython python3; ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ]));
STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase

5
pkgs/top-level/all-packages.nix
View File

@ -13446,10 +13446,7 @@ in
bftpd = callPackage ../servers/ftp/bftpd {}; bftpd = callPackage ../servers/ftp/bftpd {};
bind = callPackage ../servers/dns/bind { bind = callPackage ../servers/dns/bind { };
enablePython = config.bind.enablePython or false;
python3 = python3.withPackages (ps: with ps; [ ply ]);
};
dnsutils = bind.dnsutils; dnsutils = bind.dnsutils;
inherit (callPackages ../servers/bird { }) inherit (callPackages ../servers/bird { })