alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #70782 from wizeman/u/fix-gnutls-aarch64

Browse source 
gnutls: fix test-ciphers-api.sh failure on aarch64
This commit is contained in:
Robin Gloster 2019-10-16 00:15:13 +02:00 committed by GitHub
parent 62e4a35fa7 2b24d465cc
commit 7eccec667e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/gnutls/default.nix
View file

@ -1,6 +1,6 @@
{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkgconfig, lzip { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
, perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv , 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 , guileBindings ? config.gnutls.guile or false, guile
, tpmSupport ? false, trousers, which, nettools, libunistring , tpmSupport ? false, trousers, which, nettools, libunistring
, withSecurity ? false, Security # darwin Security.framework , withSecurity ? false, Security # darwin Security.framework
@ -67,7 +67,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ perl pkgconfig ] nativeBuildInputs = [ perl pkgconfig ]
++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ] ++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ]
++ lib.optionals doCheck [ which nettools ]; ++ lib.optionals doCheck [ which nettools utillinux ];
propagatedBuildInputs = [ nettle ]; propagatedBuildInputs = [ nettle ];

1
pkgs/top-level/all-packages.nix
View file

@ -11185,6 +11185,7 @@ in
gnutls = callPackage ../development/libraries/gnutls/default.nix { gnutls = callPackage ../development/libraries/gnutls/default.nix {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
utillinux = utillinuxMinimal; # break the cyclic dependency
}; };
gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix {