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

gnutls: don't set cert location except on Linux

Browse Source 
Also refactor lib.optional*. Preserves .drv hashes on Linux.
This commit is contained in:
Vladimír Čunát 2015-06-11 09:02:56 +02:00
parent d21b6702a3
commit 2b99951f99
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/gnutls/generic.nix
View File

@ -7,17 +7,21 @@
assert guileBindings -> guile != null; assert guileBindings -> guile != null;
let
inherit (stdenv.lib) optional optionals optionalString;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnutls-${version}"; name = "gnutls-${version}";
inherit src patches; inherit src patches;
configureFlags = [ configureFlags =
# FIXME: perhaps use $SSL_CERT_FILE instead # 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" "--disable-dependency-tracking"
"--enable-fast-install" "--enable-fast-install"
] ++ stdenv.lib.optional guileBindings ] ++ optionals guileBindings
[ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ]; [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
# Build of the Guile bindings is not parallel-safe. See # Build of the Guile bindings is not parallel-safe. See
@ -26,9 +30,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = !guileBindings; enableParallelBuilding = !guileBindings;
buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp ] buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp ]
++ stdenv.lib.optional stdenv.isLinux trousers ++ optional stdenv.isLinux trousers
++ [ unbound ] ++ [ unbound ]
++ stdenv.lib.optional guileBindings guile; ++ optional guileBindings guile;
nativeBuildInputs = [ perl pkgconfig autoreconfHook ]; nativeBuildInputs = [ perl pkgconfig autoreconfHook ];
@ -37,7 +41,7 @@ stdenv.mkDerivation rec {
doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
# Fixup broken libtool and pkgconfig files # Fixup broken libtool and pkgconfig files
preFixup = stdenv.lib.optionalString (!stdenv.isDarwin) '' preFixup = optionalString (!stdenv.isDarwin) ''
sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \ sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \
-e 's,-lz,-L${zlib}/lib -lz,' \ -e 's,-lz,-L${zlib}/lib -lz,' \
-e 's,-lgmp,-L${gmp}/lib -lgmp,' \ -e 's,-lgmp,-L${gmp}/lib -lgmp,' \