nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00: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 { stdenv
, bazel
, cacert , cacert
, lib , lib
}: }:
let
bazelPkg = bazel;
in
args@{ args@{
name ? "${args.pname}-${args.version}" name ? "${args.pname}-${args.version}"
, bazel ? bazelPkg , bazel
, bazelFlags ? [] , bazelFlags ? []
, bazelBuildFlags ? [] , bazelBuildFlags ? []
, bazelTestFlags ? [] , bazelTestFlags ? []

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

@ -1,5 +1,6 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, bazel_3
, buildBazelPackage , buildBazelPackage
, buildPythonPackage , buildPythonPackage
, python , python
@ -45,6 +46,8 @@ let
tensorflow tensorflow
]; ];
bazel = bazel_3;
bazelTarget = ":pip_pkg"; bazelTarget = ":pip_pkg";
fetchAttrs = { 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 { jaxlib-build = callPackage ../development/python-modules/jaxlib rec {
inherit (pkgs.darwin) cctools; 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'. # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'.
cudaSupport = pkgs.config.cudaSupport or false; cudaSupport = pkgs.config.cudaSupport or false;
IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; IOKit = pkgs.darwin.apple_sdk_11_0.IOKit;