diff options
| author | Uri Baghin <uri@canva.com> | 2018-06-26 17:58:33 +1000 |
|---|---|---|
| committer | Uri Baghin <uri@canva.com> | 2018-06-26 17:58:33 +1000 |
| commit | 6b6ccebc6f2016e6e98e77ec3fbd9199680457a2 (patch) | |
| tree | 835204b5220e33c5daba667c37c378dac0b02999 | |
| parent | ccca30790bbd0783684007c5d3ddefad19244b1a (diff) | |
| download | nixlib-6b6ccebc6f2016e6e98e77ec3fbd9199680457a2.tar nixlib-6b6ccebc6f2016e6e98e77ec3fbd9199680457a2.tar.gz nixlib-6b6ccebc6f2016e6e98e77ec3fbd9199680457a2.tar.bz2 nixlib-6b6ccebc6f2016e6e98e77ec3fbd9199680457a2.tar.lz nixlib-6b6ccebc6f2016e6e98e77ec3fbd9199680457a2.tar.xz nixlib-6b6ccebc6f2016e6e98e77ec3fbd9199680457a2.tar.zst nixlib-6b6ccebc6f2016e6e98e77ec3fbd9199680457a2.zip | |
bazel: fix darwin
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 8cb137aeda35..28214e94c7aa 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python +{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { int main(int argc, char *argv[]) { char *path = getenv("PATH"); - char *pathToAppend = "${lib.makeBinPath [ coreutils ]}"; + char *pathToAppend = "${lib.makeBinPath [ coreutils gnused ]}"; char *newPath; if (path != NULL) { int length = strlen(path) + 1 + strlen(pathToAppend) + 1; @@ -71,10 +71,10 @@ stdenv.mkDerivation rec { echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc - sed -i -e "366 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "366 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "366 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "366 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh patchShebangs . ''; @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { # Save paths to hardcoded dependencies so Nix can detect them. postFixup = '' mkdir -p $out/nix-support - echo "${customBash} ${coreutils}" > $out/nix-support/depends + echo "${customBash} ${gnused} ${coreutils}" > $out/nix-support/depends ''; dontStrip = true; |