From 94f0ef6628b6069c2b4e15da7f2b53a4b9870d97 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 10 Mar 2018 23:53:53 +0300 Subject: buildFHSEnv: fix compiler search paths Fixes OpenWrt compilation. --- pkgs/build-support/build-fhs-userenv/env.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/build-support/build-fhs-userenv') diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index da8a86b68f5..9c91090dc5c 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -54,9 +54,11 @@ let export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin' # Force compilers and other tools to look in default search paths + unset NIX_ENFORCE_PURITY export NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST=1 export NIX_CFLAGS_COMPILE='-idirafter /usr/include' - export NIX_LDFLAGS_BEFORE='-L/usr/lib -L/usr/lib32' + export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32' + export NIX_LDFLAGS='-L/usr/lib -L/usr/lib32' export PKG_CONFIG_PATH=/usr/lib/pkgconfig export ACLOCAL_PATH=/usr/share/aclocal -- cgit 1.4.1