pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #42609 from uri-canva/bazel-darwin-fix

bazel: fix darwin

authored by

Matthew Justin Bauer and committed by
GitHub 52e6042b fe9f4abe

+7 -7
+7 -7
pkgs/development/tools/build-managers/bazel/default.nix
··· 1 - { stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python 1 + { stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused 2 2 # Always assume all markers valid (don't redownload dependencies). 3 3 # Also, don't clean up environment variables. 4 4 , enableNixHacks ? false ··· 41 41 42 42 int main(int argc, char *argv[]) { 43 43 char *path = getenv("PATH"); 44 - char *pathToAppend = "${lib.makeBinPath [ coreutils ]}"; 44 + char *pathToAppend = "${lib.makeBinPath [ coreutils gnused ]}"; 45 45 char *newPath; 46 46 if (path != NULL) { 47 47 int length = strlen(path) + 1 + strlen(pathToAppend) + 1; ··· 71 71 echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc 72 72 echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc 73 73 echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc 74 - sed -i -e "366 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh 75 - sed -i -e "366 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh 76 - sed -i -e "366 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh 77 - sed -i -e "366 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh 74 + sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh 75 + sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh 76 + sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh 77 + sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh 78 78 patchShebangs . 79 79 ''; 80 80 ··· 126 126 # Save paths to hardcoded dependencies so Nix can detect them. 127 127 postFixup = '' 128 128 mkdir -p $out/nix-support 129 - echo "${customBash} ${coreutils}" > $out/nix-support/depends 129 + echo "${customBash} ${gnused} ${coreutils}" > $out/nix-support/depends 130 130 ''; 131 131 132 132 dontStrip = true;