mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 20:34:52 +03:00
libgcrypt: Remove verbosity intended to avoid a systemd rebuild.
libidn2 is going to require it anyway
This commit is contained in:
parent
337d8ab2e1
commit
24ad5077f2
@ -21,18 +21,18 @@ stdenv.mkDerivation rec {
|
||||
# The build enables -O2 by default for everything else.
|
||||
hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify";
|
||||
|
||||
depsBuildBuild = stdenv.lib.optional stdenv.isCross buildPackages.stdenv.cc;
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
buildInputs = [ libgpgerror ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin gettext
|
||||
++ 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
|
||||
mkdir -p "$NIX_BUILD_TOP"/bin
|
||||
ln -s ${libgpgerror.dev}/bin/gpg-error-config "$NIX_BUILD_TOP/bin"
|
||||
export PATH="$NIX_BUILD_TOP/bin:$PATH"
|
||||
'' else null;
|
||||
'';
|
||||
|
||||
# Make sure libraries are correct for .pc and .la files
|
||||
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
|
||||
|
Loading…
Reference in New Issue
Block a user