philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

build-fhs-chrootenv: add missing /usr/include

Browse source 
This patch brings the include/ directories of all specified packages to
appear under /usr/include in the FHS chroot. As per spec[1].

[1] http://www.pathname.com/fhs/pub/fhs-2.3.html#USRINCLUDEDIRECTORYFORSTANDARDINCLU
This commit is contained in:
Bjørn Forsman 2015-10-02 19:09:52 +02:00
parent b3d1184693
commit cd22214e0e
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
''; '';