pyrox.dev
Merge pull request #236789 from foo-dogsquared/update-solanum
+8
-13
pkgs/applications/misc/gnome-solanum/default.nix
+8
-13
pkgs/applications/misc/gnome-solanum/default.nix
···
5
5
, rustPlatform
6
6
, cargo
7
7
, desktop-file-utils
8
+
, appstream-glib
9
+
, blueprint-compiler
8
10
, meson
9
11
, ninja
10
12
, pkg-config
···
20
22
21
23
stdenv.mkDerivation rec {
22
24
pname = "solanum";
23
-
version = "3.0.1";
25
+
version = "4.0.0";
24
26
25
27
src = fetchFromGitLab {
26
28
domain = "gitlab.gnome.org";
27
29
owner = "World";
28
30
repo = "Solanum";
29
-
rev = "v${version}";
30
-
sha256 = "0cga6cz6jfbipzp008rjznkz7844licdc34lk133fcyqil0cg0ap";
31
+
rev = version;
32
+
hash = "sha256-ohUwxwhPxZlKoP5Nq/daD9z5Nj37C7MnFzyvQKp7R8E=";
31
33
};
32
34
33
-
patches = [
34
-
# Fix build with meson 0.61, can be removed on next update
35
-
# https://gitlab.gnome.org/World/Solanum/-/merge_requests/49
36
-
(fetchpatch {
37
-
url = "https://gitlab.gnome.org/World/Solanum/-/commit/e5c5d88f95b0fe4145c9ed346b8ca98a613d7cfe.patch";
38
-
sha256 = "j84P9KzMr0o38u4OD4ZPst+yqw1LCRoa1awT3nelFDI=";
39
-
})
40
-
];
41
-
42
35
cargoDeps = rustPlatform.fetchCargoTarball {
43
36
inherit src;
44
37
name = "${pname}-${version}";
45
-
sha256 = "10kzv98b2fiql9f6n2fv6lrgq4fdzxq0h4nzcq9jrw3fsggzl0wb";
38
+
hash = "sha256-eDwMBxMmj246tplZfREJkViCDbKmuWSUZyM+tChNQDA=";
46
39
};
47
40
48
41
postPatch = ''
···
57
50
python3
58
51
git
59
52
desktop-file-utils
53
+
appstream-glib
54
+
blueprint-compiler
60
55
rustPlatform.cargoSetupHook
61
56
cargo
62
57
rustc