chore: add more darwin overrides

ibis-project · Dec 16, 2024 · 000bbe4 · 000bbe4
1 parent c218635
commit 000bbe4
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 49 deletions.
diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -53,6 +53,13 @@ let
         # Use base package set from pyproject.nix builders
         (pkgs.callPackage pyproject-nix.build.packages {
           inherit python;
+          stdenv = pkgs.stdenv.override (
+            lib.optionalAttrs pkgs.stdenv.targetPlatform.isDarwin {
+              targetPlatform = pkgs.stdenv.targetPlatform // {
+                darwinSdkVersion = "12.0";
+              };
+            }
+          );
         }).overrideScope
           (lib.composeManyExtensions ([
             pyproject-build-systems.overlays.default

diff --git a/nix/pyproject-overrides.nix b/nix/pyproject-overrides.nix
@@ -53,55 +53,55 @@ in
     ];
   });
 
-  scipy = prev.scipy.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [
-      final.meson-python
-      final.pyproject-metadata
-      final.cython
-      final.packaging
-      final.numpy
-      final.pybind11
-      final.pythran
-      pkgs.pkg-config
-      pkgs.ninja
-      pkgs.meson
-      pkgs.gfortran
-      pkgs.cmake
-    ];
-  });
-
-  scikit-learn = prev.scikit-learn.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [
-      final.meson-python
-      final.pyproject-metadata
-      final.cython
-      final.packaging
-      final.numpy
-      final.scipy
-      pkgs.ninja
-      pkgs.meson
-      pkgs.gfortran
-    ];
-  });
-
-  pyproj = prev.pyproj.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [
-      final.setuptools
-      final.cython
-      pkgs.proj
-    ];
-    PROJ_DIR = "${lib.getBin pkgs.proj}";
-    PROJ_INCDIR = "${lib.getDev pkgs.proj}";
-  });
-
-  pyogrio = prev.pyogrio.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [
-      final.setuptools
-      final.versioneer
-      final.cython
-      pkgs.gdal
-    ];
-  });
+  # scipy = prev.scipy.overrideAttrs (attrs: {
+  #   nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [
+  #     final.meson-python
+  #     final.pyproject-metadata
+  #     final.cython
+  #     final.packaging
+  #     final.numpy
+  #     final.pybind11
+  #     final.pythran
+  #     pkgs.pkg-config
+  #     pkgs.ninja
+  #     pkgs.meson
+  #     pkgs.gfortran
+  #     pkgs.cmake
+  #   ];
+  # });
+  #
+  # scikit-learn = prev.scikit-learn.overrideAttrs (attrs: {
+  #   nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [
+  #     final.meson-python
+  #     final.pyproject-metadata
+  #     final.cython
+  #     final.packaging
+  #     final.numpy
+  #     final.scipy
+  #     pkgs.ninja
+  #     pkgs.meson
+  #     pkgs.gfortran
+  #   ];
+  # });
+  #
+  # pyproj = prev.pyproj.overrideAttrs (attrs: {
+  #   nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [
+  #     final.setuptools
+  #     final.cython
+  #     pkgs.proj
+  #   ];
+  #   PROJ_DIR = "${lib.getBin pkgs.proj}";
+  #   PROJ_INCDIR = "${lib.getDev pkgs.proj}";
+  # });
+  #
+  # pyogrio = prev.pyogrio.overrideAttrs (attrs: {
+  #   nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [
+  #     final.setuptools
+  #     final.versioneer
+  #     final.cython
+  #     pkgs.gdal
+  #   ];
+  # });
 }) // lib.mapAttrs (name: spec: addBuildSystems prev.${name} spec) buildSystemOverrides // {
   mysqlclient = prev.mysqlclient.overrideAttrs (attrs: {
     nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [ final.setuptools ];