summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2015-10-02 19:09:52 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2015-10-02 19:13:41 +0200
commitcd22214e0ea38c28cdcd4984116b132a61f194c3 (patch)
tree4a580c8e93eaf3aa97e642a905a748cad0364c15 /pkgs
parentb3d1184693b85e63daed01f305097b70a5dc66ba (diff)
downloadnixlib-cd22214e0ea38c28cdcd4984116b132a61f194c3.tar
nixlib-cd22214e0ea38c28cdcd4984116b132a61f194c3.tar.gz
nixlib-cd22214e0ea38c28cdcd4984116b132a61f194c3.tar.bz2
nixlib-cd22214e0ea38c28cdcd4984116b132a61f194c3.tar.lz
nixlib-cd22214e0ea38c28cdcd4984116b132a61f194c3.tar.xz
nixlib-cd22214e0ea38c28cdcd4984116b132a61f194c3.tar.zst
nixlib-cd22214e0ea38c28cdcd4984116b132a61f194c3.zip
build-fhs-chrootenv: add missing /usr/include
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
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/build-support/build-fhs-chrootenv/env.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix
index b659655f74b9..a2ac8288e8ec 100644
--- a/pkgs/build-support/build-fhs-chrootenv/env.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/env.nix
@@ -182,6 +182,12 @@ let
   setupLibDirs = if isTargetBuild then setupLibDirs_target
                                   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
   setupTargetProfile = ''
@@ -192,6 +198,7 @@ let
     cd usr
     ${linkProfile staticUsrProfileTarget}
     ${setupLibDirs}
+    ${setupIncludeDir}
     cd ..
     rm -rf usr/etc usr/var
   '';