From 147422082327a03f2a2d29e062077217a1218559 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Sat, 29 Jun 2019 22:22:02 -0700 Subject: buildGoModule: add ./ to all sub-packages (#63936) 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. --- pkgs/development/go-modules/generic/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development/go-modules/generic/default.nix') diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index ca1bab1e087e..cd98aa1fa9a6 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -125,7 +125,7 @@ let local type; type="$1" if [ -n "$subPackages" ]; then - echo "./$subPackages" + echo "$subPackages" | sed "s,\(^\| \),\1./,g" else find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique fi @@ -144,6 +144,7 @@ let export NIX_BUILD_CORES=1 fi for pkg in $(getGoDirs ""); do + echo "Building subPackage $pkg" buildGoDir install "$pkg" done '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' -- cgit 1.4.1