summary refs log tree commit diff
path: root/pkgs/build-support/build-fhs-userenv
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2017-04-12 14:41:43 +0300
committerNikolay Amiantov <ab@fmap.me>2017-04-12 14:43:08 +0300
commit54bbf91479762d0a9300e5871c4ef4dbadf22f52 (patch)
tree41fe24638ab473448734356b6a0e583232b4be81 /pkgs/build-support/build-fhs-userenv
parentffa2bc2382a82994755c60f8bab1193dc62fd3fa (diff)
downloadnixpkgs-54bbf91479762d0a9300e5871c4ef4dbadf22f52.tar
nixpkgs-54bbf91479762d0a9300e5871c4ef4dbadf22f52.tar.gz
nixpkgs-54bbf91479762d0a9300e5871c4ef4dbadf22f52.tar.bz2
nixpkgs-54bbf91479762d0a9300e5871c4ef4dbadf22f52.tar.lz
nixpkgs-54bbf91479762d0a9300e5871c4ef4dbadf22f52.tar.xz
nixpkgs-54bbf91479762d0a9300e5871c4ef4dbadf22f52.tar.zst
nixpkgs-54bbf91479762d0a9300e5871c4ef4dbadf22f52.zip
buildFHSEnv: add ACLOCAL_PATH
Fixes #24620.
Diffstat (limited to 'pkgs/build-support/build-fhs-userenv')
-rw-r--r--pkgs/build-support/build-fhs-userenv/env.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index 9a1897695a9..9c228b39114 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -52,11 +52,12 @@ let
     export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
     export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32'
     export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin'
-    export PKG_CONFIG_PATH=/usr/lib/pkgconfig
 
-    # Force compilers to look in default search paths
+    # Force compilers and other tools to look in default search paths
     export NIX_CFLAGS_COMPILE='-idirafter /usr/include'
     export NIX_LDFLAGS_BEFORE='-L/usr/lib -L/usr/lib32'
+    export PKG_CONFIG_PATH=/usr/lib/pkgconfig
+    export ACLOCAL_PATH=/usr/share/aclocal
 
     ${profile}
   '';