malcontent: 0.10.5 → 0.11.0

https://gitlab.freedesktop.org/pwithnall/malcontent/-/tags/0.11.0

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>

pkgs/development/libraries/malcontent/default.nix

@@ -5,7 +5,7 @@
 , ninja
 , pkg-config
 , gobject-introspection
-, wrapGAppsHook
+, wrapGAppsNoGuiHook
 , glib
 , coreutils
 , accountsservice
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "malcontent";
-  version = "0.10.5";
+  version = "0.11.0";
 
   outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ];
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     owner = "pwithnall";
     repo = pname;
     rev = version;
-    sha256 = "sha256-UPKAStB6wTd3qbbISHMgNw1bJjIRgn89tHnsw4ZptvQ=";
+    sha256 = "sha256-92F30DfdSJvO5C9EmNtiC/H6Fa6qQHecYSx59JKp8vA=";
   };
 
   patches = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     gobject-introspection
-    wrapGAppsHook
+    wrapGAppsNoGuiHook
   ];
 
   buildInputs = [

pkgs/development/libraries/malcontent/ui.nix

@@ -4,14 +4,15 @@
 , pkg-config
 , gobject-introspection
 , itstool
-, wrapGAppsHook
+, wrapGAppsHook4
 , glib
 , accountsservice
 , dbus
 , flatpak
 , malcontent
-, gtk3
-, appstream-glib
+, gtk4
+, libadwaita
+, appstream
 , desktop-file-utils
 , polkit
 , glib-testing
@@ -39,11 +40,11 @@ stdenv.mkDerivation rec {
     gobject-introspection
     itstool
     desktop-file-utils
-    wrapGAppsHook
+    wrapGAppsHook4
   ];
 
   buildInputs = [
-    appstream-glib
+    appstream
     dbus
     polkit
     glib-testing
@@ -54,7 +55,8 @@ stdenv.mkDerivation rec {
     accountsservice
     malcontent
     glib
-    gtk3
+    gtk4
+    libadwaita
   ];
 
   mesonFlags = [
@@ -64,6 +66,12 @@ stdenv.mkDerivation rec {
     "-Dui=enabled"
   ];
 
+  postPatch = ''
+    # https://gitlab.freedesktop.org/pwithnall/malcontent/-/merge_requests/148
+    substituteInPlace build-aux/meson_post_install.py \
+      --replace gtk-update-icon-cache gtk4-update-icon-cache
+  '';
+
   meta = with lib; {
     description = "UI components for parental controls library";
     homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent";