diff options
| author | Wael M. Nasreddine <wael.nasreddine@gmail.com> | 2019-06-26 18:02:38 -0700 |
|---|---|---|
| committer | Wael M. Nasreddine <wael.nasreddine@gmail.com> | 2019-06-26 18:56:45 -0700 |
| commit | c273648a209ff231c6043e68301916f4187cb10e (patch) | |
| tree | a3187dd8e2b0dd43ae2a76b9fdccb61c55c1b357 /pkgs/development/tools/bazel-watcher | |
| parent | 616e52e21be358fbd76d7cbd9a6d4744232490fb (diff) | |
| download | nixlib-c273648a209ff231c6043e68301916f4187cb10e.tar nixlib-c273648a209ff231c6043e68301916f4187cb10e.tar.gz nixlib-c273648a209ff231c6043e68301916f4187cb10e.tar.bz2 nixlib-c273648a209ff231c6043e68301916f4187cb10e.tar.lz nixlib-c273648a209ff231c6043e68301916f4187cb10e.tar.xz nixlib-c273648a209ff231c6043e68301916f4187cb10e.tar.zst nixlib-c273648a209ff231c6043e68301916f4187cb10e.zip | |
bazel-watcher: replace the sed commands with a patch
Diffstat (limited to 'pkgs/development/tools/bazel-watcher')
| -rw-r--r-- | pkgs/development/tools/bazel-watcher/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/tools/bazel-watcher/use-go-in-path.patch | 13 |
2 files changed, 20 insertions, 6 deletions
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 035bc16064d5..a30b5c9bd4eb 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -6,6 +6,9 @@ , stdenv }: +let + patches = [ ./use-go-in-path.patch ]; +in buildBazelPackage rec { name = "bazel-watcher-${version}"; version = "0.10.3"; @@ -22,11 +25,10 @@ buildBazelPackage rec { bazelTarget = "//ibazel"; fetchAttrs = { + inherit patches; + preBuild = '' patchShebangs . - - # tell rules_go to use the Go binary found in the PATH - sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE ''; preInstall = '' @@ -51,11 +53,10 @@ buildBazelPackage rec { }; buildAttrs = { + inherit patches; + preBuild = '' patchShebangs . - - # tell rules_go to use the Go binary found in the PATH - sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE ''; installPhase = '' diff --git a/pkgs/development/tools/bazel-watcher/use-go-in-path.patch b/pkgs/development/tools/bazel-watcher/use-go-in-path.patch new file mode 100644 index 000000000000..010ba56165d9 --- /dev/null +++ b/pkgs/development/tools/bazel-watcher/use-go-in-path.patch @@ -0,0 +1,13 @@ +diff --git a/WORKSPACE b/WORKSPACE +index 51273b6..fcf9ffb 100644 +--- a/WORKSPACE ++++ b/WORKSPACE +@@ -61,7 +61,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe + + go_rules_dependencies() + +-go_register_toolchains() ++go_register_toolchains(go_version = "host") + + load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") + |