python312Packages.jax: clean python-packages.nix call (NixOS#375269)

Author: GaetanLepage

pkgs/development/python-modules/jaxlib/default.nix

@@ -15,7 +15,7 @@
   cython,
   fetchFromGitHub,
   git,
-  IOKit,
+  darwin,
   jsoncpp,
   nsync,
   openssl,
@@ -242,25 +242,22 @@ let
       which
     ] ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ cctools ];
 
-    buildInputs =
-      [
-        curl
-        double-conversion
-        giflib
-        jsoncpp
-        libjpeg_turbo
-        numpy
-        openssl
-        pkgs.flatbuffers
-        pkgs.protobuf
-        pybind11
-        scipy
-        six
-        snappy
-        zlib
-      ]
-      ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ IOKit ]
-      ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ nsync ];
+    buildInputs = [
+      curl
+      double-conversion
+      giflib
+      jsoncpp
+      libjpeg_turbo
+      numpy
+      openssl
+      pkgs.flatbuffers
+      pkgs.protobuf
+      pybind11
+      scipy
+      six
+      snappy
+      zlib
+    ] ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ nsync ];
 
     # We don't want to be quite so picky regarding bazel version
     postPatch = ''
@@ -393,12 +390,12 @@ let
             }
         ).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}");
 
-        # Non-reproducible fetch https://github.com/NixOS/nixpkgs/issues/321920#issuecomment-2184940546
-        preInstall = ''
-          cat << \EOF > "$bazelOut/external/go_sdk/versions.json"
-          []
-          EOF
-        '';
+      # Non-reproducible fetch https://github.com/NixOS/nixpkgs/issues/321920#issuecomment-2184940546
+      preInstall = ''
+        cat << \EOF > "$bazelOut/external/go_sdk/versions.json"
+        []
+        EOF
+      '';
     };
 
     buildAttrs = {
@@ -415,7 +412,7 @@ let
       # are not available yet. Framework search paths aren't added by bintools
       # hook. See https://github.com/NixOS/nixpkgs/pull/41914.
       preBuild = lib.optionalString effectiveStdenv.hostPlatform.isDarwin ''
-        export NIX_LDFLAGS+=" -F${IOKit}/Library/Frameworks"
+        export NIX_LDFLAGS+=" -F${darwin.apple_sdk.frameworks.IOKit}/Library/Frameworks"
         substituteInPlace ../output/external/rules_cc/cc/private/toolchain/osx_cc_wrapper.sh.tpl \
           --replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool"
         substituteInPlace ../output/external/rules_cc/cc/private/toolchain/unix_cc_configure.bzl \

pkgs/top-level/python-packages.nix

@@ -6602,11 +6602,7 @@ self: super: with self; {
 
   jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { };
 
-  jaxlib-build = callPackage ../development/python-modules/jaxlib rec {
-    # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'.
-    inherit (pkgs.config) cudaSupport;
-    IOKit = pkgs.darwin.apple_sdk_11_0.IOKit;
-  };
+  jaxlib-build = callPackage ../development/python-modules/jaxlib { };
 
   jaxlib = jaxlib-bin;