forked from mirrors/nixpkgs
buildBazelPackage: make bazel explicit
This commit is contained in:
parent
f203bcdff1
commit
619ba04b87
|
@ -1,16 +1,11 @@
|
|||
{ stdenv
|
||||
, bazel
|
||||
, cacert
|
||||
, lib
|
||||
}:
|
||||
|
||||
let
|
||||
bazelPkg = bazel;
|
||||
in
|
||||
|
||||
args@{
|
||||
name ? "${args.pname}-${args.version}"
|
||||
, bazel ? bazelPkg
|
||||
, bazel
|
||||
, bazelFlags ? []
|
||||
, bazelBuildFlags ? []
|
||||
, bazelTestFlags ? []
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, bazel_3
|
||||
, buildBazelPackage
|
||||
, buildPythonPackage
|
||||
, python
|
||||
|
@ -45,6 +46,8 @@ let
|
|||
tensorflow
|
||||
];
|
||||
|
||||
bazel = bazel_3;
|
||||
|
||||
bazelTarget = ":pip_pkg";
|
||||
|
||||
fetchAttrs = {
|
||||
|
|
|
@ -4803,9 +4803,6 @@ self: super: with self; {
|
|||
|
||||
jaxlib-build = callPackage ../development/python-modules/jaxlib rec {
|
||||
inherit (pkgs.darwin) cctools;
|
||||
buildBazelPackage = pkgs.buildBazelPackage.override {
|
||||
stdenv = if stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else stdenv;
|
||||
};
|
||||
# Some platforms don't have `cudaSupport` defined, hence the need for 'or false'.
|
||||
cudaSupport = pkgs.config.cudaSupport or false;
|
||||
IOKit = pkgs.darwin.apple_sdk_11_0.IOKit;
|
||||
|
|
Loading…
Reference in a new issue