diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-15 10:54:15 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-15 10:54:15 +0200 |
| commit | 674c82739c1287da6f2446095f221d8da394788d (patch) | |
| tree | d113141fe80d5dc93afc81c0cc335bafa1a1a30b /pkgs/development/libraries | |
| parent | 9e28e56f200d1158c4a126c48ff99b9909ab1f7d (diff) | |
| parent | 338a19520493f941a3f478bf852074e74a67b03d (diff) | |
| download | nixlib-674c82739c1287da6f2446095f221d8da394788d.tar nixlib-674c82739c1287da6f2446095f221d8da394788d.tar.gz nixlib-674c82739c1287da6f2446095f221d8da394788d.tar.bz2 nixlib-674c82739c1287da6f2446095f221d8da394788d.tar.lz nixlib-674c82739c1287da6f2446095f221d8da394788d.tar.xz nixlib-674c82739c1287da6f2446095f221d8da394788d.tar.zst nixlib-674c82739c1287da6f2446095f221d8da394788d.zip | |
Merge #26613: init and use dns-root-data
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/gnutls/generic.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/ldns/default.nix | 18 |
2 files changed, 18 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 48aa3fb96737..2a73682a7461 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,6 +1,7 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip , guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, libiconv , tpmSupport ? false, trousers, which, nettools, libunistring +, unbound, dns-root-data # Version dependent args , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] @@ -32,12 +33,13 @@ stdenv.mkDerivation { ++ [ "--disable-dependency-tracking" "--enable-fast-install" + "--with-unbound-root-key-file=${dns-root-data}/root.key" ] ++ lib.optional guileBindings [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ]; enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring ] + buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring unbound ] ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 91eb7aecea90..816b850f1003 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, perl}: +{stdenv, fetchurl, openssl, perl, dns-root-data}: stdenv.mkDerivation rec { pname = "ldns"; @@ -15,15 +15,27 @@ stdenv.mkDerivation rec { patchShebangs doc/doxyparse.pl ''; - outputs = [ "out" "dev" "man" ]; + outputs = [ "out" "dev" "man" "examples" ]; nativeBuildInputs = [ perl ]; buildInputs = [ openssl ]; - configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill"]; + configureFlags = [ + "--with-ssl=${openssl.dev}" + "--with-trust-anchor=${dns-root-data}/root.key" + "--with-drill" + "--disable-gost" + ]; postInstall = '' moveToOutput "bin/ldns-config" "$dev" + + pushd examples + configureFlagsArray+=( "--bindir=$examples/bin" ) + configurePhase + make + make install + popd ''; meta = with stdenv.lib; { |