diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-04-14 19:22:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-04-14 19:22:02 +0200 |
| commit | f7a4f146c9fd64966f57040603a897857a14df94 (patch) | |
| tree | 088bb991f168b899e7c36df46aac6aa0611b5052 /pkgs/build-support | |
| parent | 878bbaf4e9d49c251d90f0790d2e7ebcf622ddd0 (diff) | |
| parent | 2090aa4f65e860567af03cb3b7aa042df7168ead (diff) | |
| download | nixlib-f7a4f146c9fd64966f57040603a897857a14df94.tar nixlib-f7a4f146c9fd64966f57040603a897857a14df94.tar.gz nixlib-f7a4f146c9fd64966f57040603a897857a14df94.tar.bz2 nixlib-f7a4f146c9fd64966f57040603a897857a14df94.tar.lz nixlib-f7a4f146c9fd64966f57040603a897857a14df94.tar.xz nixlib-f7a4f146c9fd64966f57040603a897857a14df94.tar.zst nixlib-f7a4f146c9fd64966f57040603a897857a14df94.zip | |
Merge branch 'master' into staging
This includes a fix for a bad merge.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv/env.nix | 5 |
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 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} ''; |