JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgcrypt: Remove verbosity intended to avoid a systemd rebuild.

Browse Source 
libidn2 is going to require it anyway
This commit is contained in:
Shea Levy 2018-02-25 08:24:34 -05:00
parent 337d8ab2e1
commit 24ad5077f2
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libgcrypt/default.nix
View File

@ -21,18 +21,18 @@ stdenv.mkDerivation rec {
# The build enables -O2 by default for everything else. # The build enables -O2 by default for everything else.
hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify";
depsBuildBuild = stdenv.lib.optional stdenv.isCross buildPackages.stdenv.cc; depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = [ libgpgerror ] buildInputs = [ libgpgerror ]
++ stdenv.lib.optional stdenv.isDarwin gettext ++ stdenv.lib.optional stdenv.isDarwin gettext
++ stdenv.lib.optional enableCapabilities libcap; ++ stdenv.lib.optional enableCapabilities libcap;
preConfigure = if stdenv.isCross then '' preConfigure = stdenv.lib.optionalString stdenv.isCross ''
# This is intentional: gpg-error-config is a shell script that will work during the build # This is intentional: gpg-error-config is a shell script that will work during the build
mkdir -p "$NIX_BUILD_TOP"/bin mkdir -p "$NIX_BUILD_TOP"/bin
ln -s ${libgpgerror.dev}/bin/gpg-error-config "$NIX_BUILD_TOP/bin" ln -s ${libgpgerror.dev}/bin/gpg-error-config "$NIX_BUILD_TOP/bin"
export PATH="$NIX_BUILD_TOP/bin:$PATH" export PATH="$NIX_BUILD_TOP/bin:$PATH"
'' else null; '';
# Make sure libraries are correct for .pc and .la files # Make sure libraries are correct for .pc and .la files
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config # Also make sure includes are fixed for callers who don't use libgpgcrypt-config