diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-11-10 23:59:57 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-11-11 00:01:02 +0300 |
| commit | 1b69894d744f855857df9ff1589d95da3af573db (patch) | |
| tree | 51ecb1347a3c1c1a71d6ca3b74ec6eef3b2a242f /pkgs/build-support | |
| parent | d8c5f4dd561e81ff2d9a7ec7e6672f5e33b7ef8b (diff) | |
| download | nixlib-1b69894d744f855857df9ff1589d95da3af573db.tar nixlib-1b69894d744f855857df9ff1589d95da3af573db.tar.gz nixlib-1b69894d744f855857df9ff1589d95da3af573db.tar.bz2 nixlib-1b69894d744f855857df9ff1589d95da3af573db.tar.lz nixlib-1b69894d744f855857df9ff1589d95da3af573db.tar.xz nixlib-1b69894d744f855857df9ff1589d95da3af573db.tar.zst nixlib-1b69894d744f855857df9ff1589d95da3af573db.zip | |
fhs-env: symlink /usr/lib to libs for the main architecture
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-fhs-chrootenv/env.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix index 4c307a77d126..a8293ea803cc 100644 --- a/pkgs/build-support/build-fhs-chrootenv/env.nix +++ b/pkgs/build-support/build-fhs-chrootenv/env.nix @@ -54,8 +54,8 @@ let etcProfile = nixpkgs.writeText "profile" '' export PS1='${name}-chrootenv:\u@\h:\w\$ ' - export LOCALE_ARCHIVE='/usr/lib${if isMultiBuild then "64" else ""}/locale/locale-archive' - export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib:/lib64 + 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='/usr/bin:/usr/sbin' ${profile} ''; @@ -129,7 +129,7 @@ let setupLibDirs_multi = '' mkdir -m0755 lib32 mkdir -m0755 lib64 - ln -s lib32 lib + ln -s lib64 lib # copy glibc stuff cp -rsHf ${staticUsrProfileTarget}/lib/32/* lib32/ && chmod u+w -R lib32/ @@ -149,6 +149,9 @@ let # copy gcc libs cp -rsHf ${chosenGcc.cc}/lib/* lib32/ cp -rsHf ${chosenGcc.cc}/lib64/* lib64/ + + # symlink 32-bit ld-linux.so + ln -s ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/ ''; setupLibDirs = if isTargetBuild then setupLibDirs_target |