nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 15:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fhs-env: symlink /usr/lib to libs for the main architecture

Browse Source
This commit is contained in:
Nikolay Amiantov 2015-11-10 23:59:57 +03:00
parent d8c5f4dd56
commit 1b69894d74
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/build-support/build-fhs-chrootenv/env.nix
View File

@ -54,8 +54,8 @@ let
etcProfile = nixpkgs.writeText "profile" '' etcProfile = nixpkgs.writeText "profile" ''
export PS1='${name}-chrootenv:\u@\h:\w\$ ' export PS1='${name}-chrootenv:\u@\h:\w\$ '
export LOCALE_ARCHIVE='/usr/lib${if isMultiBuild then "64" else ""}/locale/locale-archive' export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib:/lib64 export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32'
export PATH='/usr/bin:/usr/sbin' export PATH='/usr/bin:/usr/sbin'
${profile} ${profile}
''; '';
@ -129,7 +129,7 @@ let
setupLibDirs_multi = '' setupLibDirs_multi = ''
mkdir -m0755 lib32 mkdir -m0755 lib32
mkdir -m0755 lib64 mkdir -m0755 lib64
ln -s lib32 lib ln -s lib64 lib
# copy glibc stuff # copy glibc stuff
cp -rsHf ${staticUsrProfileTarget}/lib/32/* lib32/ && chmod u+w -R lib32/ cp -rsHf ${staticUsrProfileTarget}/lib/32/* lib32/ && chmod u+w -R lib32/
@ -149,6 +149,9 @@ let
# copy gcc libs # copy gcc libs
cp -rsHf ${chosenGcc.cc}/lib/* lib32/ cp -rsHf ${chosenGcc.cc}/lib/* lib32/
cp -rsHf ${chosenGcc.cc}/lib64/* lib64/ 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 setupLibDirs = if isTargetBuild then setupLibDirs_target

4
pkgs/games/steam/chrootenv.nix
View File

@ -40,12 +40,10 @@ buildFHSUserEnv {
]; ];
extraBuildCommands = '' extraBuildCommands = ''
[ -d lib64 ] && mv lib64/steam lib
mkdir -p steamrt mkdir -p steamrt
ln -s ../lib64/steam-runtime steamrt/amd64 ln -s ../lib64/steam-runtime steamrt/amd64
ln -s ../lib/steam-runtime steamrt/i386 ln -s ../lib32/steam-runtime steamrt/i386
''; '';
profile = '' profile = ''