diff options
author | Shea Levy <shea@shealevy.com> | 2018-02-25 08:24:34 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-02-25 08:24:34 -0500 |
commit | 24ad5077f246f90315569b381b57fc701aa3ef77 (patch) | |
tree | c1853729a681ad9f3094a12187e3fad7c4edb42c /pkgs/development/libraries/libgcrypt/default.nix | |
parent | 337d8ab2e1b17ff065e69059483bd064271ec2f6 (diff) | |
download | nixpkgs-24ad5077f246f90315569b381b57fc701aa3ef77.tar nixpkgs-24ad5077f246f90315569b381b57fc701aa3ef77.tar.gz nixpkgs-24ad5077f246f90315569b381b57fc701aa3ef77.tar.bz2 nixpkgs-24ad5077f246f90315569b381b57fc701aa3ef77.tar.lz nixpkgs-24ad5077f246f90315569b381b57fc701aa3ef77.tar.xz nixpkgs-24ad5077f246f90315569b381b57fc701aa3ef77.tar.zst nixpkgs-24ad5077f246f90315569b381b57fc701aa3ef77.zip |
libgcrypt: Remove verbosity intended to avoid a systemd rebuild.
libidn2 is going to require it anyway
Diffstat (limited to 'pkgs/development/libraries/libgcrypt/default.nix')
-rw-r--r-- | pkgs/development/libraries/libgcrypt/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index a02aefb0a74..6f36199bd1a 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -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 |