public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10185 from bjornfor/build-fhs-env-with-usr-include

Browse Source 
build-fhs-chrootenv: add missing /usr/include
This commit is contained in:
Nikolay Amiantov 2015-10-02 21:51:18 +03:00
commit 4236131295
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,6 +182,12 @@ let
setupLibDirs = if isTargetBuild then setupLibDirs_target setupLibDirs = if isTargetBuild then setupLibDirs_target
else setupLibDirs_multi; else setupLibDirs_multi;
setupIncludeDir = ''
if [ -x "${staticUsrProfileTarget}/include" ]
then
ln -s "${staticUsrProfileTarget}/include"
fi
'';
# the target profile is the actual profile that will be used for the chroot # the target profile is the actual profile that will be used for the chroot
setupTargetProfile = '' setupTargetProfile = ''
@ -192,6 +198,7 @@ let
cd usr cd usr
${linkProfile staticUsrProfileTarget} ${linkProfile staticUsrProfileTarget}
${setupLibDirs} ${setupLibDirs}
${setupIncludeDir}
cd .. cd ..
rm -rf usr/etc usr/var rm -rf usr/etc usr/var
''; '';