diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-10-02 21:51:18 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-10-02 21:51:18 +0300 |
| commit | 423613129505299ee0779863cd759c0afb31ce24 (patch) | |
| tree | 41c58f2b0cf9e0492ab1f80066b894b13c45a8f6 | |
| parent | a4db37c4e984ecb3b6431f1ca96f8c01cd9afa60 (diff) | |
| parent | cd22214e0ea38c28cdcd4984116b132a61f194c3 (diff) | |
| download | nixlib-423613129505299ee0779863cd759c0afb31ce24.tar nixlib-423613129505299ee0779863cd759c0afb31ce24.tar.gz nixlib-423613129505299ee0779863cd759c0afb31ce24.tar.bz2 nixlib-423613129505299ee0779863cd759c0afb31ce24.tar.lz nixlib-423613129505299ee0779863cd759c0afb31ce24.tar.xz nixlib-423613129505299ee0779863cd759c0afb31ce24.tar.zst nixlib-423613129505299ee0779863cd759c0afb31ce24.zip | |
Merge pull request #10185 from bjornfor/build-fhs-env-with-usr-include
build-fhs-chrootenv: add missing /usr/include
| -rw-r--r-- | pkgs/build-support/build-fhs-chrootenv/env.nix | 7 |
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 ''; |