gnutls, trousers: fix .la and .pc files, remove propagated build inputs
cc @vcunat @wkennington
This commit is contained in:
@@ -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/;
|
||||
|
||||
Reference in New Issue
Block a user