diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2017-08-07 16:52:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 16:52:59 -0400 |
| commit | de1110b52a7a78821c765db34b9300f08d3871e9 (patch) | |
| tree | 44c49f3e289c7860d78e39c9aadd0de8ba455079 /pkgs/development/libraries | |
| parent | 44c354317d48eb97a726bceaa482be1db3836584 (diff) | |
| parent | 07796ccb578e44b8545133bb7dc2a73537d94c59 (diff) | |
| download | nixlib-de1110b52a7a78821c765db34b9300f08d3871e9.tar nixlib-de1110b52a7a78821c765db34b9300f08d3871e9.tar.gz nixlib-de1110b52a7a78821c765db34b9300f08d3871e9.tar.bz2 nixlib-de1110b52a7a78821c765db34b9300f08d3871e9.tar.lz nixlib-de1110b52a7a78821c765db34b9300f08d3871e9.tar.xz nixlib-de1110b52a7a78821c765db34b9300f08d3871e9.tar.zst nixlib-de1110b52a7a78821c765db34b9300f08d3871e9.zip | |
Merge pull request #27960 from LnL7/clang-libgcrypt
libgcrypt: fix clang build
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/libgcrypt/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index ed742bee8741..5bcb8c5fe98a 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: +{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: assert enableCapabilities -> stdenv.isLinux; @@ -14,9 +14,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; outputBin = "dev"; - buildInputs = - [ libgpgerror ] - ++ lib.optional enableCapabilities libcap; + # The CPU Jitter random number generator must not be compiled with + # optimizations and the optimize -O0 pragma only works for gcc. + # The build enables -O2 by default for everything else. + hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; + + buildInputs = [ libgpgerror ] + ++ stdenv.lib.optional enableCapabilities libcap; # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config |