swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

buildBazelPackage: make bazel explicit

Browse source
This commit is contained in:
Uri Baghin 2023-01-12 09:09:55 +11:00
parent f203bcdff1
commit 619ba04b87
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/build-support/build-bazel-package/default.nix
View file

@ -1,16 +1,11 @@
{ stdenv
, bazel
, cacert
, lib
}:
let
bazelPkg = bazel;
in
args@{
name ? "${args.pname}-${args.version}"
, bazel ? bazelPkg
, bazel
, bazelFlags ? []
, bazelBuildFlags ? []
, bazelTestFlags ? []

3
pkgs/development/python-modules/tensorflow-probability/default.nix
View file

@ -1,5 +1,6 @@
{ lib
, fetchFromGitHub
, bazel_3
, buildBazelPackage
, buildPythonPackage
, python
@ -45,6 +46,8 @@ let
tensorflow
];
bazel = bazel_3;
bazelTarget = ":pip_pkg";
fetchAttrs = {

3
pkgs/top-level/python-packages.nix
View file

@ -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;