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

buildGoModule: share the buildFlagsArray with the parallel subprocesses

Browse Source
This commit is contained in:
Shea Levy 2017-03-15 11:00:55 -04:00
parent 162845d5b1
commit d6c3e74425
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/go-modules/generic/default.nix
View File

@ -116,6 +116,7 @@ go.stdenv.mkDerivation (
local d; local cmd; local d; local cmd;
cmd="$1" cmd="$1"
d="$2" d="$2"
. $TMPDIR/buildFlagsArray
echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0
[ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
local OUT local OUT
@ -143,6 +144,11 @@ go.stdenv.mkDerivation (
fi fi
} }
if [ ''${#buildFlagsArray[@]} -ne 0 ]; then
declare -p buildFlagsArray > $TMPDIR/buildFlagsArray
else
touch $TMPDIR/buildFlagsArray
fi
export -f buildGoDir # parallel needs to see the function export -f buildGoDir # parallel needs to see the function
if [ -z "$enableParallelBuilding" ]; then if [ -z "$enableParallelBuilding" ]; then
export NIX_BUILD_CORES=1 export NIX_BUILD_CORES=1