dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

bazel_7: Simplify callBazelTest

Browse Source
This commit is contained in:
Guillaume Maudoux 2023-10-20 02:57:09 +02:00
parent 78dd0bafa6
commit e0a1a73c41
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
View File

@ -9,6 +9,7 @@
, runCommandCC , runCommandCC
, makeWrapper , makeWrapper
, recurseIntoAttrs , recurseIntoAttrs
, newScope
# this package (through the fixpoint glass) # this package (through the fixpoint glass)
, bazel_self , bazel_self
, lr , lr
@ -352,9 +353,9 @@ stdenv.mkDerivation rec {
hash = "sha256-DaPKp7Sn5uvfZRjdDx6grot3g3B7trqCyL0TRIdwg98="; hash = "sha256-DaPKp7Sn5uvfZRjdDx6grot3g3B7trqCyL0TRIdwg98=";
}; };
callBazelTest = lib.callPackageWith { callBazelTest = newScope {
inherit runLocal bazelTest bazel-examples lib writeText darwin runtimeShell stdenv writeScript jdk11_headless openjdk8 fetchFromGitHub fetchurl ripgrep unzip jdk17_headless Foundation; inherit runLocal bazelTest bazel-examples distDir;
inherit distDir; inherit Foundation;
extraBazelArgs = '' extraBazelArgs = ''
--repository_cache=${repoCache} \ --repository_cache=${repoCache} \
--repo_env=JAVA_HOME=${runJdk}${if isDarwin then "/zulu-17.jdk/Contents/Home" else "/lib/openjdk"} \ --repo_env=JAVA_HOME=${runJdk}${if isDarwin then "/zulu-17.jdk/Contents/Home" else "/lib/openjdk"} \