From 54bbf91479762d0a9300e5871c4ef4dbadf22f52 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 12 Apr 2017 14:41:43 +0300 Subject: buildFHSEnv: add ACLOCAL_PATH Fixes #24620. --- pkgs/build-support/build-fhs-userenv/env.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 9a1897695a9d..9c228b391147 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} ''; -- cgit 1.4.1