fix(pycairo): fix later versions of pycairo

nix-community · Oct 26, 2023 · 973ccb6 · 973ccb6
1 parent 8f2c483
commit 973ccb6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 22 deletions.
diff --git a/overrides/build-systems.json b/overrides/build-systems.json
@@ -14247,6 +14247,9 @@
     "setuptools",
     "setuptools-scm"
   ],
+  "pygobject": [
+    "setuptools"
+  ],
   "pygobject-stubs": [
     "setuptools"
   ],
@@ -16389,6 +16392,9 @@
   "python-monkey-business": [
     "setuptools"
   ],
+  "python-mpd2": [
+    "setuptools"
+  ],
   "python-mpv-jsonipc": [
     "setuptools"
   ],

diff --git a/overrides/default.nix b/overrides/default.nix
@@ -2122,31 +2122,29 @@ lib.composeManyExtensions [
             ) else
           super.pyarrow;
 
-      pycairo = (
-        drv: (
-          drv.overridePythonAttrs (
-            _: {
-              format = "other";
-            }
-          )
-        ).overridePythonAttrs (
-          old: {
+      pycairo = super.pycairo.overridePythonAttrs (
+        old: {
+          format = "other";
+          nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [
+            self.meson
+            pkgs.ninja
+            pkg-config
+          ];
 
-            nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
-              self.meson
-              pkgs.ninja
-              pkg-config
-            ];
+          propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [
+            pkgs.cairo
+          ];
 
-            propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [
-              pkgs.cairo
-            ];
+          preBuild = ''
+            cd ../
+          '';
 
-            mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ];
-          }
-        )
-      )
-        super.pycairo;
+          postBuild = ''
+            cd build
+          '';
+          mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ];
+        }
+      );
 
       pycocotools = super.pycocotools.overridePythonAttrs (
         old: {