From e6f4f0ef8db8a2e600ecf38d4cda7777ba6f04b3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 18 Nov 2018 18:32:32 -0600 Subject: [PATCH] libgcrypt: pass --with-libgpg-error-prefix Avoids having to put the gpg-error-config binary directly in PATH. /cc @shlevy --- pkgs/development/libraries/libgcrypt/default.nix | 7 +------ 1 file changed, 1 insertion(+), 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