Merge pull request #196850 from wegank/grilo-darwin

2022-11-16 00:43:48 +01:00
parent fb1fbcb057 bd2baae6d1
commit ee3c5d899f
14 changed files with 25 additions and 16 deletions
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
    description = "A D-Bus API for the dLeyna services";
    homepage = "https://github.com/phako/dleyna-connector-dbus";
    maintainers = with maintainers; [ jtojnar ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    license = licenses.lgpl21Only;
  };
 }
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
    description = "Library of utility functions that are used by the higher level dLeyna";
    homepage = "https://github.com/phako/dleyna-core";
    maintainers = with maintainers; [ jtojnar ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    license = licenses.lgpl21Only;
  };
 }
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
    description = "Library to discover and manipulate Digital Media Renderers";
    homepage = "https://github.com/phako/dleyna-renderer";
    maintainers = with maintainers; [ jtojnar ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    license = licenses.lgpl21Only;
  };
 }
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
    description = "Library to discover, browse and manipulate Digital Media Servers";
    homepage = "https://github.com/phako/dleyna-server";
    maintainers = with maintainers; [ jtojnar ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    license = licenses.lgpl21Only;
  };
 }
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
    description = "A GObject to SQLite object mapper";
    homepage = "https://wiki.gnome.org/Projects/Gom";
    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = teams.gnome.members;
  };
 }
@@ -94,6 +94,6 @@ stdenv.mkDerivation rec {
    description = "A collection of plugins for the Grilo framework";
    maintainers = teams.gnome.members;
    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchurl
+, fetchpatch
 , meson
 , mesonEmulatorHook
 , ninja
@@ -34,6 +35,13 @@ stdenv.mkDerivation rec {
    sha256 = "81Ks9zZlZpk0JwY2/t5mtS2mgB/iD2OMQEirJnhXey0=";
  };

+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/grilo/-/commit/b0d75be00b06cb0163dabbedecf9122a55273349.patch";
+      sha256 = "sha256-Hwnc3TLN6n3w/MAFcprHv7nbTcwRfI0cmfDriNLnAvQ=";
+    })
+  ];
+
  mesonFlags = [
    "-Denable-gtk-doc=true"
  ];
@@ -73,6 +81,6 @@ stdenv.mkDerivation rec {
    description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
    maintainers = teams.gnome.members;
    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
@@ -50,7 +50,8 @@ stdenv.mkDerivation rec {
    "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
  ];

-  doCheck = true;
+  # Bail out! GLib-GIO-FATAL-CRITICAL: g_inet_address_to_string: assertion 'G_IS_INET_ADDRESS (address)' failed
+  doCheck = !stdenv.isDarwin;

  postFixup = lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) ''
    # Move developer documentation to devdoc output.
@@ -73,7 +74,6 @@ stdenv.mkDerivation rec {
  };

  meta = with lib; {
-    broken = stdenv.isDarwin;
    description = "GObject-based API for handling resource discovery and announcement over SSDP";
    homepage = "http://www.gupnp.org/";
    license = licenses.lgpl2Plus;
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
    homepage = "http://gupnp.org/";
    description = "A collection of helpers for building AV (audio/video) applications using GUPnP";
    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
@@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
    homepage = "https://wiki.gnome.org/Projects/GUPnP/";
    description = "Library to ease DLNA-related bits for applications using GUPnP";
    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
@@ -65,6 +65,6 @@ stdenv.mkDerivation rec {
    description = "Library to handle UPnP IGD port mapping";
    homepage = "http://www.gupnp.org/";
    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
@@ -67,7 +67,8 @@ stdenv.mkDerivation rec {
    "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
  ];

-  doCheck = true;
+  # Bail out! ERROR:../tests/test-bugs.c:168:test_on_timeout: code should not be reached
+  doCheck = !stdenv.isDarwin;

  passthru = {
    updateScript = gnome.updateScript {
@@ -80,6 +81,6 @@ stdenv.mkDerivation rec {
    homepage = "http://www.gupnp.org/";
    description = "An implementation of the UPnP specification";
    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
    description = "Library tasked with managing, extracting and handling media art caches";
    maintainers = teams.gnome.members;
    license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
@@ -53,6 +53,6 @@ stdenv.mkDerivation rec {
    homepage = "https://wiki.gnome.org/Projects/GUPnP";
    license = licenses.gpl2Plus;
    maintainers = teams.gnome.members;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }