From 4b2ab665fbeb28b9837e920841ca81c570dfbdd4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 21 May 2020 09:16:34 -0400 Subject: [PATCH] pkg-config-wrapper: Provide autoconf macros This fixes libarchive, and probably numerous other builds. --- pkgs/build-support/pkg-config-wrapper/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index 75390ab4b6f..3e5785d2398 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -64,6 +64,15 @@ stdenv.mkDerivation { echo $pkg-config > $out/nix-support/orig-pkg-config wrap ${targetPrefix}pkg-config ${./pkg-config-wrapper.sh} "${getBin pkg-config}/bin/pkg-config" + '' + # symlink in share for autoconf to find macros + + # TODO(@Ericson2314): in the future just make the unwrapped pkg-config a + # propagated dep once we can rely on downstream deps comming first in + # search paths. (https://github.com/NixOS/nixpkgs/pull/31414 took a crack + # at this.) + + '' + ln -s ${pkg-config}/share $out/share ''; strictDeps = true;