Unverified Commit 52e6042b authored by Matthew Justin Bauer's avatar Matthew Justin Bauer Committed by GitHub
Browse files

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

bazel: fix darwin
parents fe9f4abe 6b6ccebc

pkgs/development/tools/build-managers/bazel/default.nix

+7 −7
Original line number Diff line number Diff line 
{ 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;