From 2b99951f995a0c110197137b131c68a62eb57f83 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 11 Jun 2015 09:02:56 +0200 Subject: gnutls: don't set cert location except on Linux Also refactor lib.optional*. Preserves .drv hashes on Linux. --- pkgs/development/libraries/gnutls/generic.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'pkgs/development/libraries/gnutls') diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 8c169153a66..07760933935 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -7,17 +7,21 @@ assert guileBindings -> guile != null; +let + inherit (stdenv.lib) optional optionals optionalString; +in stdenv.mkDerivation rec { name = "gnutls-${version}"; inherit src patches; - configureFlags = [ + configureFlags = # FIXME: perhaps use $SSL_CERT_FILE instead - "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" + optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" + ++ [ "--disable-dependency-tracking" "--enable-fast-install" - ] ++ stdenv.lib.optional guileBindings + ] ++ optionals guileBindings [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ]; # Build of the Guile bindings is not parallel-safe. See @@ -26,9 +30,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = !guileBindings; buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp ] - ++ stdenv.lib.optional stdenv.isLinux trousers + ++ optional stdenv.isLinux trousers ++ [ unbound ] - ++ stdenv.lib.optional guileBindings guile; + ++ optional guileBindings guile; nativeBuildInputs = [ perl pkgconfig autoreconfHook ]; @@ -37,7 +41,7 @@ stdenv.mkDerivation rec { doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); # Fixup broken libtool and pkgconfig files - preFixup = stdenv.lib.optionalString (!stdenv.isDarwin) '' + preFixup = optionalString (!stdenv.isDarwin) '' sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \ -e 's,-lz,-L${zlib}/lib -lz,' \ -e 's,-lgmp,-L${gmp}/lib -lgmp,' \ -- cgit 1.4.1