about summary refs log tree commit diff
path: root/pkgs/build-support/pkg-config-wrapper
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-05-21 09:16:34 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-05-21 09:16:34 -0400
commit4b2ab665fbeb28b9837e920841ca81c570dfbdd4 (patch)
treefaee27134d11d0e3d0831590ac0e139b65b0b559 /pkgs/build-support/pkg-config-wrapper
parentf29919da616a51d805ef1cf3800d023d9d00e2dc (diff)
pkg-config-wrapper: Provide autoconf macros
This fixes libarchive, and probably numerous other builds.
Diffstat (limited to 'pkgs/build-support/pkg-config-wrapper')
-rw-r--r--pkgs/build-support/pkg-config-wrapper/default.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix
index 75390ab4b6ffb..3e5785d239886 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;