diff options
| author | Wael Nasreddine <wael.nasreddine@gmail.com> | 2019-06-29 22:22:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-29 22:22:02 -0700 |
| commit | 147422082327a03f2a2d29e062077217a1218559 (patch) | |
| tree | 3fad5fd5fd1776a8753208d18e4b487511d72c9e /pkgs/development/go-modules | |
| parent | 5b7e3718ee3dc1c6f0bebd4c76816a0003e8f295 (diff) | |
| download | nixpkgs-147422082327a03f2a2d29e062077217a1218559.tar nixpkgs-147422082327a03f2a2d29e062077217a1218559.tar.gz nixpkgs-147422082327a03f2a2d29e062077217a1218559.tar.bz2 nixpkgs-147422082327a03f2a2d29e062077217a1218559.tar.lz nixpkgs-147422082327a03f2a2d29e062077217a1218559.tar.xz nixpkgs-147422082327a03f2a2d29e062077217a1218559.tar.zst nixpkgs-147422082327a03f2a2d29e062077217a1218559.zip | |
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.
Diffstat (limited to 'pkgs/development/go-modules')
| -rw-r--r-- | pkgs/development/go-modules/generic/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index ca1bab1e087..cd98aa1fa9a 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) '' |