ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

gnutls: Don't depend on trousers by default

Browse Source 
Let's keep the base system free of "trusted" computing crap...
This commit is contained in:
Eelco Dolstra 2015-07-26 12:37:57 +02:00
parent f64589b2ef
commit ecae014ddb
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
{ fetchurl, stdenv, autoreconfHook, zlib, lzo, libtasn1, nettle, pkgconfig, lzip { lib, fetchurl, stdenv, autoreconfHook, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
, guileBindings, guile, perl, gmp, libidn, p11_kit, unbound, trousers , guileBindings, guile, perl, gmp, libidn, p11_kit, unbound
, tpmSupport ? false, trousers
# Version dependent args # Version dependent args
, version, src, patches ? [] , version, src, patches ? []
@ -7,9 +8,6 @@
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}";
@ -17,11 +15,11 @@ stdenv.mkDerivation rec {
configureFlags = configureFlags =
# FIXME: perhaps use $SSL_CERT_FILE instead # FIXME: perhaps use $SSL_CERT_FILE instead
optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" lib.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"
] ++ optionals guileBindings ] ++ lib.optional 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
@ -30,9 +28,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 ]
++ optional stdenv.isLinux trousers ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
++ [ unbound ] ++ [ unbound ]
++ optional guileBindings guile; ++ lib.optional guileBindings guile;
nativeBuildInputs = [ perl pkgconfig autoreconfHook ]; nativeBuildInputs = [ perl pkgconfig autoreconfHook ];
@ -41,14 +39,14 @@ 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 = optionalString (!stdenv.isDarwin) '' preFixup = lib.optionalString (!stdenv.isDarwin) ''
sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \ sed ${lib.optionalString tpmSupport "-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,' \
-i $out/lib/libgnutls.la $out/lib/pkgconfig/gnutls.pc -i $out/lib/libgnutls.la $out/lib/pkgconfig/gnutls.pc
''; '';
meta = with stdenv.lib; { meta = with lib; {
description = "The GNU Transport Layer Security Library"; description = "The GNU Transport Layer Security Library";
longDescription = '' longDescription = ''