From 6b6183125ecbec7c56de5443234f0f0c00a51f5a Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 25 Apr 2015 11:36:38 +0200 Subject: [PATCH] gnutls, trousers: fix .la and .pc files, remove propagated build inputs cc @vcunat @wkennington --- pkgs/development/libraries/gnutls/generic.nix | 12 +++++++++--- pkgs/tools/security/trousers/default.nix | 9 +++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 3c1db4d7fafe..930713f59873 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -23,10 +23,8 @@ stdenv.mkDerivation rec { # for the actual fix. enableParallelBuilding = !guileBindings; - buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit ] + buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp trousers unbound ] ++ stdenv.lib.optional guileBindings guile; - # The paths for these libraries are not specified in the .la and .pc files - propagatedBuildInputs = [ zlib gmp trousers unbound ]; nativeBuildInputs = [ perl pkgconfig autoreconfHook ]; @@ -34,6 +32,14 @@ stdenv.mkDerivation rec { # http://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); + # Fixup broken libtool and pkgconfig files + preFixup = '' + sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \ + -e 's,-lz,-L${zlib}/lib -lz,' \ + -e 's,-lgmp,-L${gmp}/lib -lgmp,' \ + -i $out/lib/libgnutls.la $out/lib/pkgconfig/gnutls.pc + ''; + meta = with stdenv.lib; { description = "The GNU Transport Layer Security Library"; diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 471782ce8f32..38ff4acc43bd 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchurl, openssl, pkgconfig }: stdenv.mkDerivation rec { name = "trousers-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1lvnla1c1ig2w3xvvrqg2w9qm7a1ygzy1j2gg8j7p8c87i58x45v"; }; - propagatedBuildInputs = [ openssl ]; + buildInputs = [ openssl pkgconfig ]; patches = [ ./allow-non-tss-config-file-owner.patch ]; @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DALLOW_NON_TSS_CONFIG_FILE"; NIX_LDFLAGS = "-lgcc_s"; + # Fix broken libtool file + preFixup = '' + sed 's,-lcrypto,-L${openssl}/lib -lcrypto,' -i $out/lib/libtspi.la + ''; + meta = with stdenv.lib; { description = "Trusted computing software stack"; homepage = http://trousers.sourceforge.net/;