diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-08-31 06:15:35 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-10-11 18:52:31 +0200 |
commit | 10568866e050d1c0d517b9169349b17ee17f5327 (patch) | |
tree | b76ff7e7019d16d69502d2f6a2cdc875c1e57575 | |
parent | fed9f9420e6d4e99ba1365cb7553f75795179206 (diff) | |
download | nixpkgs-10568866e050d1c0d517b9169349b17ee17f5327.tar nixpkgs-10568866e050d1c0d517b9169349b17ee17f5327.tar.gz nixpkgs-10568866e050d1c0d517b9169349b17ee17f5327.tar.bz2 nixpkgs-10568866e050d1c0d517b9169349b17ee17f5327.tar.lz nixpkgs-10568866e050d1c0d517b9169349b17ee17f5327.tar.xz nixpkgs-10568866e050d1c0d517b9169349b17ee17f5327.tar.zst nixpkgs-10568866e050d1c0d517b9169349b17ee17f5327.zip |
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>
-rw-r--r-- | pkgs/development/libraries/malcontent/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/malcontent/ui.nix | 20 |
2 files changed, 18 insertions, 10 deletions
diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 4154f0315cd..92ec2354288 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/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 = [ diff --git a/pkgs/development/libraries/malcontent/ui.nix b/pkgs/development/libraries/malcontent/ui.nix index e306267154a..8969d1e1342 100644 --- a/pkgs/development/libraries/malcontent/ui.nix +++ b/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"; |