diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2017-12-19 16:55:19 -0500 |
|---|---|---|
| committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2017-12-23 20:20:08 -0500 |
| commit | 23ffb9d701e8eb7b56f8c2c56f69ec9114e3c3ca (patch) | |
| tree | d5c7ffbcdbc3b031fe87d35e32dbffd9ca67b47d /pkgs/development/compilers/go | |
| parent | d7e6066c712ae08c4731eea1ec33f827e241c2f2 (diff) | |
| download | nixlib-23ffb9d701e8eb7b56f8c2c56f69ec9114e3c3ca.tar nixlib-23ffb9d701e8eb7b56f8c2c56f69ec9114e3c3ca.tar.gz nixlib-23ffb9d701e8eb7b56f8c2c56f69ec9114e3c3ca.tar.bz2 nixlib-23ffb9d701e8eb7b56f8c2c56f69ec9114e3c3ca.tar.lz nixlib-23ffb9d701e8eb7b56f8c2c56f69ec9114e3c3ca.tar.xz nixlib-23ffb9d701e8eb7b56f8c2c56f69ec9114e3c3ca.tar.zst nixlib-23ffb9d701e8eb7b56f8c2c56f69ec9114e3c3ca.zip | |
go-1.8, go-1.9: use stdenv.shell instead of /usr/bin/env bash
Fixes tests on ARMv6/7 during sandboxed builds.
Diffstat (limited to 'pkgs/development/compilers/go')
| -rw-r--r-- | pkgs/development/compilers/go/1.8.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.9.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 210f259df89a..23fd3b0f2912 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go '' + optionalString stdenv.isArm '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go - echo '#!/usr/bin/env bash' > misc/cgo/testplugin/test.bash + echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 8708bd762c4d..e908a8725e2a 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go '' + optionalString stdenv.isArm '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go - echo '#!/usr/bin/env bash' > misc/cgo/testplugin/test.bash + echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true |