diff options
author | William A. Kennington III <william@wkennington.com> | 2015-05-14 17:42:11 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-05-14 17:58:30 -0700 |
commit | 1a045673f67e1da33db9ab7c38f4ee84fc1cb664 (patch) | |
tree | 6bbd71ecfbf154eff7f315d66d3c5264c0360ba2 | |
parent | fecf412767af5b027985871a5a3f14f12ce79f06 (diff) | |
download | nixlib-1a045673f67e1da33db9ab7c38f4ee84fc1cb664.tar nixlib-1a045673f67e1da33db9ab7c38f4ee84fc1cb664.tar.gz nixlib-1a045673f67e1da33db9ab7c38f4ee84fc1cb664.tar.bz2 nixlib-1a045673f67e1da33db9ab7c38f4ee84fc1cb664.tar.lz nixlib-1a045673f67e1da33db9ab7c38f4ee84fc1cb664.tar.xz nixlib-1a045673f67e1da33db9ab7c38f4ee84fc1cb664.tar.zst nixlib-1a045673f67e1da33db9ab7c38f4ee84fc1cb664.zip |
go-modules: Cleanup submodule detection
Also, only build the sources that matter for distribution
-rw-r--r-- | pkgs/development/go-modules/generic/default.nix | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 69efdfd54d3e..62082842fcee 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -55,12 +55,10 @@ go.stdenv.mkDerivation ( args // { go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p done else - find . -type d | while read d; do - for i in $d/*.go; do - go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d - break - done - done + (cd go/src + find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq | while read d; do + go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d + done) fi runHook postBuild @@ -74,12 +72,10 @@ go.stdenv.mkDerivation ( args // { go test -p $NIX_BUILD_CORES -v $goPackagePath/$p done else - find . -type d | while read d; do - for i in $d/*_test.go; do - go test -p $NIX_BUILD_CORES -v $d - break - done - done + (cd go/src + find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq | while read d; do + go test -p $NIX_BUILD_CORES -v $d + done) fi runHook postCheck |