public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildFHSEnv: post-closure-size fix

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-13 14:28:33 +03:00
parent acf06763f4
commit d0fd551876
1 changed files with 5 additions and 2 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

@ -3,6 +3,7 @@
{ name, profile ? "" { name, profile ? ""
, pkgs ? null, targetPkgs ? pkgs: [], multiPkgs ? pkgs: [] , pkgs ? null, targetPkgs ? pkgs: [], multiPkgs ? pkgs: []
, extraBuildCommands ? "", extraBuildCommandsMulti ? "" , extraBuildCommands ? "", extraBuildCommandsMulti ? ""
, extraOutputsToInstall ? []
}: }:
# HOWTO: # HOWTO:
@ -119,12 +120,14 @@ let
staticUsrProfileTarget = nixpkgs.buildEnv { staticUsrProfileTarget = nixpkgs.buildEnv {
name = "${name}-usr-target"; name = "${name}-usr-target";
paths = [ etcPkg ] ++ basePkgs ++ targetPaths; paths = [ etcPkg ] ++ basePkgs ++ targetPaths;
extraOutputsToInstall = [ "lib" "out" ] ++ extraOutputsToInstall;
ignoreCollisions = true; ignoreCollisions = true;
}; };
staticUsrProfileMulti = nixpkgs.buildEnv { staticUsrProfileMulti = nixpkgs.buildEnv {
name = "system-profile-multi"; name = "system-profile-multi";
paths = multiPaths; paths = multiPaths;
extraOutputsToInstall = [ "lib" "out" ] ++ extraOutputsToInstall;
ignoreCollisions = true; ignoreCollisions = true;
}; };
@ -158,8 +161,8 @@ let
cp -rsHf ${staticUsrProfileTarget}/lib64/* lib64/ && chmod u+w -R lib64/ cp -rsHf ${staticUsrProfileTarget}/lib64/* lib64/ && chmod u+w -R lib64/
# copy gcc libs # copy gcc libs
cp -rsHf ${chosenGcc.cc}/lib/* lib32/ cp -rsHf ${chosenGcc.cc.lib}/lib/* lib32/
cp -rsHf ${chosenGcc.cc}/lib64/* lib64/ cp -rsHf ${chosenGcc.cc.lib}/lib64/* lib64/
# symlink 32-bit ld-linux.so # symlink 32-bit ld-linux.so
ln -s ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/ ln -s ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/