about summary refs log tree commit diff
path: root/pkgs/applications/misc/gnome-solanum/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/misc/gnome-solanum/default.nix')
-rw-r--r--pkgs/applications/misc/gnome-solanum/default.nix21
1 files changed, 8 insertions, 13 deletions
diff --git a/pkgs/applications/misc/gnome-solanum/default.nix b/pkgs/applications/misc/gnome-solanum/default.nix
index 7e1c5b1eba12..a93f55683b6f 100644
--- a/pkgs/applications/misc/gnome-solanum/default.nix
+++ b/pkgs/applications/misc/gnome-solanum/default.nix
@@ -5,6 +5,8 @@
 , rustPlatform
 , cargo
 , desktop-file-utils
+, appstream-glib
+, blueprint-compiler
 , meson
 , ninja
 , pkg-config
@@ -20,29 +22,20 @@
 
 stdenv.mkDerivation rec {
   pname = "solanum";
-  version = "3.0.1";
+  version = "4.0.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "Solanum";
-    rev = "v${version}";
-    sha256 = "0cga6cz6jfbipzp008rjznkz7844licdc34lk133fcyqil0cg0ap";
+    rev = version;
+    hash = "sha256-ohUwxwhPxZlKoP5Nq/daD9z5Nj37C7MnFzyvQKp7R8E=";
   };
 
-  patches = [
-    # Fix build with meson 0.61, can be removed on next update
-    # https://gitlab.gnome.org/World/Solanum/-/merge_requests/49
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/World/Solanum/-/commit/e5c5d88f95b0fe4145c9ed346b8ca98a613d7cfe.patch";
-      sha256 = "j84P9KzMr0o38u4OD4ZPst+yqw1LCRoa1awT3nelFDI=";
-    })
-  ];
-
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    sha256 = "10kzv98b2fiql9f6n2fv6lrgq4fdzxq0h4nzcq9jrw3fsggzl0wb";
+    hash = "sha256-eDwMBxMmj246tplZfREJkViCDbKmuWSUZyM+tChNQDA=";
   };
 
   postPatch = ''
@@ -57,6 +50,8 @@ stdenv.mkDerivation rec {
     python3
     git
     desktop-file-utils
+    appstream-glib
+    blueprint-compiler
     rustPlatform.cargoSetupHook
     cargo
     rustc