gnome-solanum: 3.0.1 -> 4.0.0
This commit is contained in:
parent
58e6faecd5
commit
789cd5ec5e
|
@ -5,6 +5,8 @@
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, cargo
|
, cargo
|
||||||
, desktop-file-utils
|
, desktop-file-utils
|
||||||
|
, appstream-glib
|
||||||
|
, blueprint-compiler
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
@ -20,29 +22,20 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "solanum";
|
pname = "solanum";
|
||||||
version = "3.0.1";
|
version = "4.0.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.gnome.org";
|
domain = "gitlab.gnome.org";
|
||||||
owner = "World";
|
owner = "World";
|
||||||
repo = "Solanum";
|
repo = "Solanum";
|
||||||
rev = "v${version}";
|
rev = version;
|
||||||
sha256 = "0cga6cz6jfbipzp008rjznkz7844licdc34lk133fcyqil0cg0ap";
|
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 {
|
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||||
inherit src;
|
inherit src;
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
sha256 = "10kzv98b2fiql9f6n2fv6lrgq4fdzxq0h4nzcq9jrw3fsggzl0wb";
|
hash = "sha256-eDwMBxMmj246tplZfREJkViCDbKmuWSUZyM+tChNQDA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -57,6 +50,8 @@ stdenv.mkDerivation rec {
|
||||||
python3
|
python3
|
||||||
git
|
git
|
||||||
desktop-file-utils
|
desktop-file-utils
|
||||||
|
appstream-glib
|
||||||
|
blueprint-compiler
|
||||||
rustPlatform.cargoSetupHook
|
rustPlatform.cargoSetupHook
|
||||||
cargo
|
cargo
|
||||||
rustc
|
rustc
|
||||||
|
|
Loading…
Reference in a new issue