diff options
Diffstat (limited to 'pkgs/build-support/build-fhs-chrootenv/env.nix')
-rw-r--r-- | pkgs/build-support/build-fhs-chrootenv/env.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix index 8c45c9c9036b..01d75727f0bf 100644 --- a/pkgs/build-support/build-fhs-chrootenv/env.nix +++ b/pkgs/build-support/build-fhs-chrootenv/env.nix @@ -3,6 +3,7 @@ { name, profile ? "" , pkgs ? null, targetPkgs ? pkgs: [], multiPkgs ? pkgs: [] , extraBuildCommands ? "", extraBuildCommandsMulti ? "" +, extraOutputsToInstall ? [] }: # HOWTO: @@ -57,6 +58,7 @@ let export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32' export PATH='/var/setuid-wrappers:/usr/bin:/usr/sbin' + export PKG_CONFIG_PATH=/usr/lib/pkgconfig # Force compilers to look in default search paths export NIX_CFLAGS_COMPILE='-idirafter /usr/include' @@ -118,12 +120,14 @@ let staticUsrProfileTarget = nixpkgs.buildEnv { name = "${name}-usr-target"; paths = [ etcPkg ] ++ basePkgs ++ targetPaths; + extraOutputsToInstall = [ "lib" "out" ] ++ extraOutputsToInstall; ignoreCollisions = true; }; staticUsrProfileMulti = nixpkgs.buildEnv { name = "system-profile-multi"; paths = multiPaths; + extraOutputsToInstall = [ "lib" "out" ] ++ extraOutputsToInstall; ignoreCollisions = true; }; @@ -157,8 +161,8 @@ let cp -rsHf ${staticUsrProfileTarget}/lib64/* lib64/ && chmod u+w -R lib64/ # copy gcc libs - cp -rsHf ${chosenGcc.cc}/lib/* lib32/ - cp -rsHf ${chosenGcc.cc}/lib64/* lib64/ + cp -rsHf ${chosenGcc.cc.lib}/lib/* lib32/ + cp -rsHf ${chosenGcc.cc.lib}/lib64/* lib64/ # symlink 32-bit ld-linux.so ln -s ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/ |