diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-18 18:32:32 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-18 18:52:43 -0600 |
| commit | e6f4f0ef8db8a2e600ecf38d4cda7777ba6f04b3 (patch) | |
| tree | 00ee1dbe17c8ba56139cf0fcacdcd48481cccbcd /pkgs/development/libraries/libgcrypt | |
| parent | 85bd2a7acb10eca811d23b0c4ee440f8cdc503ec (diff) | |
| download | nixlib-e6f4f0ef8db8a2e600ecf38d4cda7777ba6f04b3.tar nixlib-e6f4f0ef8db8a2e600ecf38d4cda7777ba6f04b3.tar.gz nixlib-e6f4f0ef8db8a2e600ecf38d4cda7777ba6f04b3.tar.bz2 nixlib-e6f4f0ef8db8a2e600ecf38d4cda7777ba6f04b3.tar.lz nixlib-e6f4f0ef8db8a2e600ecf38d4cda7777ba6f04b3.tar.xz nixlib-e6f4f0ef8db8a2e600ecf38d4cda7777ba6f04b3.tar.zst nixlib-e6f4f0ef8db8a2e600ecf38d4cda7777ba6f04b3.zip | |
libgcrypt: pass --with-libgpg-error-prefix
Avoids having to put the gpg-error-config binary directly in PATH. /cc @shlevy
Diffstat (limited to 'pkgs/development/libraries/libgcrypt')
| -rw-r--r-- | pkgs/development/libraries/libgcrypt/default.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 6912817419f6..173dc1f722b4 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -27,12 +27,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin gettext ++ stdenv.lib.optional enableCapabilities libcap; - preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - # 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" - ''; + configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ]; # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config |