Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.

Commit

Permalink
trousers: 0.3.13 -> 0.3.14
Browse files Browse the repository at this point in the history
* Update trousers to latest, use regular openssl (#68338)

trousers: cleanup

* some CFLAGS and LDFLAGS are not needed anymore

* libtool file fixup was a no-op

* license is now BSD-3 since:
https://sourceforge.net/p/trousers/trousers/ci/0160d229f8fbab7c6900662155f42050e3d563a0/

(cherry picked from commit 82dfacc)
  • Loading branch information
reanimus authored and c0bw3b committed Nov 11, 2019
1 parent 74047c1 commit d493b97
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 15 deletions.
19 changes: 7 additions & 12 deletions pkgs/tools/security/trousers/default.nix
Expand Up @@ -2,35 +2,30 @@

stdenv.mkDerivation rec {
pname = "trousers";
version = "0.3.13";
version = "0.3.14";

src = fetchurl {
url = "mirror://sourceforge/trousers/trousers/${version}/${pname}-${version}.tar.gz";
sha256 = "1lvnla1c1ig2w3xvvrqg2w9qm7a1ygzy1j2gg8j7p8c87i58x45v";
sha256 = "0iwgsbrbb7nfqgl61x8aailwxm8akxh9gkcwxhsvf50x4qx72l6f";
};

sourceRoot = ".";

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ];

patches = [ ./allow-non-tss-config-file-owner.patch ];

configureFlags = [ "--disable-usercheck" ];

# Attempt to remove -std=gnu89 when updating if using gcc5
NIX_CFLAGS_COMPILE = "-std=gnu89 -DALLOW_NON_TSS_CONFIG_FILE";
NIX_LDFLAGS = "-lgcc_s";

# Fix broken libtool file
preFixup = stdenv.lib.optionalString (!stdenv.isDarwin) ''
sed 's,-lcrypto,-L${openssl.out}/lib -lcrypto,' -i $out/lib/libtspi.la
'';
NIX_CFLAGS_COMPILE = [ "-DALLOW_NON_TSS_CONFIG_FILE" ];
enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "Trusted computing software stack";
homepage = http://trousers.sourceforge.net/;
license = licenses.cpl10;
license = licenses.bsd3;
maintainers = [ maintainers.ak ];
platforms = platforms.linux;
};
}

4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -6560,9 +6560,7 @@ in

trilium = callPackage ../applications/office/trilium { };

trousers = callPackage ../tools/security/trousers {
openssl = openssl_1_0_2;
};
trousers = callPackage ../tools/security/trousers { };

trx = callPackage ../tools/audio/trx { };

Expand Down

0 comments on commit d493b97

Please sign in to comment.