public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-07-16 17:14:44 +02:00
parent 2efc2ada84 f001c81c1a
commit 6d339e5863
107 changed files with 4127 additions and 1896 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/build-managers/bazel/0.4.nix
+2 -1
View File
@@ -65,8 +65,9 @@ stdenv.mkDerivation rec {
];
buildPhase = ''
export TMPDIR=/tmp/.bazel-$UID
./compile.sh
./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \
./output/bazel --output_user_root=$TMPDIR/.bazel build //scripts:bash_completion \
--spawn_strategy=standalone \
--genrule_strategy=standalone
cp bazel-bin/scripts/bazel-complete.bash output/
pkgs/development/tools/build-managers/bazel/default.nix
+2 -2
View File
@@ -96,9 +96,9 @@ stdenv.mkDerivation rec {
# Change this to $(mktemp -d) as soon as we figure out why.
buildPhase = ''
export TMPDIR=/tmp
export TMPDIR=/tmp/.bazel-$UID
./compile.sh
./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \
./output/bazel --output_user_root=$TMPDIR/.bazel build //scripts:bash_completion \
--spawn_strategy=standalone \
--genrule_strategy=standalone
cp bazel-bin/scripts/bazel-complete.bash output/