gobject-introspection: 1.78.1 → 1.79.1

bobby285271 · bobby285271 · commit 14436ce56247 · 2024-03-10T12:22:56.000+08:00
https://gitlab.gnome.org/GNOME/gobject-introspection/-/compare/1.78.1...1.79.1
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
@@ -49,8 +49,11 @@ let
     ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
   '';
 
-  # Avoid introducing cairo, which enables gobjectSupport by default.
-  gobject-introspection' = buildPackages.gobject-introspection.override { x11Support = false; };
+  gobject-introspection' = buildPackages.gobject-introspection.override {
+    propagateFullGlib = false;
+    # Avoid introducing cairo, which enables gobjectSupport by default.
+    x11Support = false;
+  };
 
   librarySuffix = if (stdenv.targetPlatform.extensions.library == ".so") then "2.0.so.0"
                   else if (stdenv.targetPlatform.extensions.library == ".dylib") then "2.0.0.dylib"
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchurl
+, fetchpatch2
 , glib
 , flex
 , bison
@@ -22,6 +23,7 @@
 , nixStoreDir ? builtins.storeDir
 , x11Support ? true
 , testers
+, propagateFullGlib ? true
 }:
 
 # now that gobject-introspection creates large .gir files (eg gtk3 case)
@@ -39,7 +41,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gobject-introspection";
-  version = "1.78.1";
+  version = "1.79.1";
 
   # outputs TODO: share/gobject-introspection-1.0/tests is needed during build
   # by pygobject3 (and maybe others), but it's only searched in $out
@@ -48,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz";
-    sha256 = "vXur2Zr3JY52gZ5Fukprw5lgj+di2D/ePKwDPFCEG7Q=";
+    sha256 = "+A6jPuBcpI+5l5UrtGExz73TdR9/XaBoiIc5y+stVEM=";
   };
 
   patches = [
@@ -59,6 +61,13 @@ stdenv.mkDerivation (finalAttrs: {
       src = ./absolute_shlib_path.patch;
       inherit nixStoreDir;
     })
+
+    # girepository: Skip GIRepository versions not matching GIRepository-2.0
+    # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/441
+    (fetchpatch2 {
+      url = "https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/171f1804dc76dfcc2857e809d49a2290b15612c4.patch";
+      hash = "sha256-rAOuz8EB5bACG+5tgvA0Z/vGkFBPNUqryXFNNUjlOEc=";
+    })
   ] ++ lib.optionals x11Support [
     # Hardcode the cairo shared library path in the Cairo gir shipped with this package.
     # https://github.com/NixOS/nixpkgs/issues/34080
@@ -95,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = [
     libffi
-    glib'
+    (if propagateFullGlib then glib else glib')
   ];
 
   mesonFlags = [
