diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-02-23 14:09:07 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-02-23 14:09:07 +0300 |
| commit | 6b72418ee5159a6eb1850556abee4fd143cc1f2a (patch) | |
| tree | 634e1c279ab702383aa698369c3b2221fce25b84 /pkgs/build-support | |
| parent | b1d056324a3f26c7ff073a4b8a4e11ed6ad5c68e (diff) | |
| parent | b002fdd89fdf22283e7627b7ea951a614dbf8041 (diff) | |
| download | nixlib-6b72418ee5159a6eb1850556abee4fd143cc1f2a.tar nixlib-6b72418ee5159a6eb1850556abee4fd143cc1f2a.tar.gz nixlib-6b72418ee5159a6eb1850556abee4fd143cc1f2a.tar.bz2 nixlib-6b72418ee5159a6eb1850556abee4fd143cc1f2a.tar.lz nixlib-6b72418ee5159a6eb1850556abee4fd143cc1f2a.tar.xz nixlib-6b72418ee5159a6eb1850556abee4fd143cc1f2a.tar.zst nixlib-6b72418ee5159a6eb1850556abee4fd143cc1f2a.zip | |
Merge pull request #6532 from abbradar/6486-fix
buiildFHSEnv: check if multiPkgs is empty
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-fhs-chrootenv/env.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix index b810adefab16..ee18f86893bb 100644 --- a/pkgs/build-support/build-fhs-chrootenv/env.nix +++ b/pkgs/build-support/build-fhs-chrootenv/env.nix @@ -142,7 +142,7 @@ let cp -rsf ${staticUsrProfileTarget}/lib/32/* lib/ # copy content of multiPaths (32bit libs) - cp -rsf ${staticUsrProfileMulti}/lib/* lib/ + [ -d ${staticUsrProfileMulti}/lib ] && cp -rsf ${staticUsrProfileMulti}/lib/* lib/ # copy content of targetPaths (64bit libs) cp -rsf ${staticUsrProfileTarget}/lib/* lib64/ |