diff options
author | Luca Bruno <lethalman88@gmail.com> | 2015-04-25 11:36:38 +0200 |
---|---|---|
committer | Luca Bruno <lethalman88@gmail.com> | 2015-04-25 11:43:08 +0200 |
commit | 6b6183125ecbec7c56de5443234f0f0c00a51f5a (patch) | |
tree | a45ecc88156bc85b992b0a018c5b82054d787781 /pkgs/tools/security/trousers | |
parent | 02cda2133fc8bb6330853acdaf39f3e50747af62 (diff) |
gnutls, trousers: fix .la and .pc files, remove propagated build inputs
cc @vcunat @wkennington
Diffstat (limited to 'pkgs/tools/security/trousers')
-rw-r--r-- | pkgs/tools/security/trousers/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 471782ce8f322..38ff4acc43bd6 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/; |