Merge pull request #1370 from cpcloud/fix-gobject-introspection

fix gobject introspection
nix-community · Oct 26, 2023 · 4c171fe · 4c171fe
2 parents 43a7430 + 63f51bf
commit 4c171fe
Show file tree

Hide file tree

Showing 7 changed files with 113 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: {

diff --git a/tests/default.nix b/tests/default.nix
@@ -145,6 +145,7 @@ in
   subdirectory = callTest ./subdirectory { };
   plyvel = callTest ./plyvel { };
   awsume = callTest ./awsume { };
+  gobject-introspection = callTest ./gobject-introspection { };
 } // lib.optionalAttrs (!stdenv.isDarwin) {
   # pyqt5 = (callTest ./pyqt5 { });
   pyqt6 = callTest ./pyqt6 { };

diff --git a/tests/gobject-introspection/default.nix b/tests/gobject-introspection/default.nix
@@ -0,0 +1,10 @@
+{ pkgs, poetry2nix, python310 }:
+
+poetry2nix.mkPoetryApplication {
+  python = python310;
+  projectDir = ./.;
+  pythonImportsCheck = [ "gobject_introspection_test" ];
+
+  buildInputs = [ pkgs.libnotify ];
+  nativeBuildInputs = [ pkgs.gobject-introspection ];
+}
diff --git a/tests/gobject-introspection/gobject_introspection_test/__init__.py b/tests/gobject-introspection/gobject_introspection_test/__init__.py
@@ -0,0 +1,5 @@
+import gi
+
+gi.require_version("Notify", "0.7")
+
+from gi.repository import Notify  # noqa: E402, F401
diff --git a/tests/gobject-introspection/poetry.lock b/tests/gobject-introspection/poetry.lock
diff --git a/tests/gobject-introspection/pyproject.toml b/tests/gobject-introspection/pyproject.toml
@@ -0,0 +1,14 @@
+[tool.poetry]
+name = "gobject-introspection-test"
+version = "0.1.0"
+description = ""
+authors = ["You <[email protected]>"]
+
+[tool.poetry.dependencies]
+python = "^3.10"
+python-mpd2 = "^3.1.0"
+PyGObject = "^3.46.0"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"