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

buildGoModule: add ./ to all sub-packages (#63936)

Browse Source 
When $subPackages has more than one item, the build was failing because
./ was added only to the first subPackage. This commit adds ./ to all
specified subPackages.
This commit is contained in:
Wael Nasreddine 2019-06-29 22:22:02 -07:00 committed by GitHub
parent 5b7e3718ee
commit 1474220823
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,7 +125,7 @@ let
local type; local type;
type="$1" type="$1"
if [ -n "$subPackages" ]; then if [ -n "$subPackages" ]; then
echo "./$subPackages" echo "$subPackages" | sed "s,\(^\| \),\1./,g"
else else
find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique
fi fi
@ -144,6 +144,7 @@ let
export NIX_BUILD_CORES=1 export NIX_BUILD_CORES=1
fi fi
for pkg in $(getGoDirs ""); do for pkg in $(getGoDirs ""); do
echo "Building subPackage $pkg"
buildGoDir install "$pkg" buildGoDir install "$pkg"
done done
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''