diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 13:33:13 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 13:33:37 +0200 |
| commit | 5227fb1dd53fcb5918b9342dff4868f4ad68427e (patch) | |
| tree | d6cd521e3f67944031216a27f740f28f22b73b41 /pkgs/tools/security/trousers | |
| parent | d6dd3b8bd1eaeeb21dfdb5051cd4732c748ce5d7 (diff) | |
| parent | 33373d939a19f465228ddede6d38ce9032b5916b (diff) | |
Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
Diffstat (limited to 'pkgs/tools/security/trousers')
| -rw-r--r-- | pkgs/tools/security/trousers/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 208ffa136d081..d57aa8c63a92f 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -15,11 +15,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-usercheck" ]; - NIX_CFLAGS_COMPILE = "-DALLOW_NON_TSS_CONFIG_FILE"; + # 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 = '' + preFixup = stdenv.lib.optionalString (!stdenv.isDarwin) '' sed 's,-lcrypto,-L${openssl.out}/lib -lcrypto,' -i $out/lib/libtspi.la ''; |