diff options
| author | Ricardo M. Correia <rcorreia@wizy.org> | 2019-10-08 18:39:36 +0200 |
|---|---|---|
| committer | Ricardo M. Correia <rcorreia@wizy.org> | 2019-10-10 01:12:11 +0200 |
| commit | 2b24d465cc8946ad9d74aea8c435bd562eaff0d1 (patch) | |
| tree | 88507c3cc44611774190a2053acbdb04b11c1bec | |
| parent | e6149855b15a580cec4c4e0f0c3442bc2fad4d74 (diff) | |
| download | nixlib-2b24d465cc8946ad9d74aea8c435bd562eaff0d1.tar nixlib-2b24d465cc8946ad9d74aea8c435bd562eaff0d1.tar.gz nixlib-2b24d465cc8946ad9d74aea8c435bd562eaff0d1.tar.bz2 nixlib-2b24d465cc8946ad9d74aea8c435bd562eaff0d1.tar.lz nixlib-2b24d465cc8946ad9d74aea8c435bd562eaff0d1.tar.xz nixlib-2b24d465cc8946ad9d74aea8c435bd562eaff0d1.tar.zst nixlib-2b24d465cc8946ad9d74aea8c435bd562eaff0d1.zip | |
gnutls: fix test-ciphers-api.sh failure on aarch64
See https://gitlab.com/gnutls/gnutls/issues/764 for more info.
| -rw-r--r-- | pkgs/development/libraries/gnutls/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 1b17f4c800f5..0d548e442352 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,6 +1,6 @@ { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkgconfig, lzip , perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv -, unbound, dns-root-data, gettext, cacert +, unbound, dns-root-data, gettext, cacert, utillinux , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? false, trousers, which, nettools, libunistring , withSecurity ? false, Security # darwin Security.framework @@ -67,7 +67,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ perl pkgconfig ] ++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ] - ++ lib.optionals doCheck [ which nettools ]; + ++ lib.optionals doCheck [ which nettools utillinux ]; propagatedBuildInputs = [ nettle ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c158aee20a09..8eb916dd79c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11164,6 +11164,7 @@ in gnutls = callPackage ../development/libraries/gnutls/default.nix { inherit (darwin.apple_sdk.frameworks) Security; + utillinux = utillinuxMinimal; # break the cyclic dependency }; gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { |