Merge pull request #235301 from bobby285271/upd/gnome
This commit is contained in:
commit
382163b3c7
|
@ -1,11 +1,11 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, gnome
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
, gtk4
|
||||
, wrapGAppsHook4
|
||||
, libadwaita
|
||||
, librsvg
|
||||
, gettext
|
||||
, itstool
|
||||
|
@ -19,40 +19,30 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-mahjongg";
|
||||
version = "3.38.3";
|
||||
version = "3.40.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj";
|
||||
sha256 = "WorIbXY8VmDdkCX3vAgxC5IjRvp+Lfe2SMmJTa4/GD8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with meson 0.61
|
||||
# data/meson.build:24:0: ERROR: Function does not take positional arguments.
|
||||
# data/meson.build:45:0: ERROR: Function does not take positional arguments.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/commit/a2037b0747163601a5d5b57856d037eecf3a4db7.patch";
|
||||
sha256 = "Wcder6Y9H6c1f8I+IPDvST3umaCU21HgxfXn809JDz0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
vala
|
||||
desktop-file-utils
|
||||
pkg-config
|
||||
gnome.adwaita-icon-theme
|
||||
libxml2
|
||||
itstool
|
||||
gettext
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
glib # for glib-compile-schemas
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
gtk4
|
||||
libadwaita
|
||||
librsvg
|
||||
];
|
||||
|
||||
|
|
Loading…
Reference in a new issue