diff options
author | maxine <35892750+maxeaubrey@users.noreply.github.com> | 2023-06-01 20:41:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-01 20:41:09 +0200 |
commit | 382163b3c7d4d0e6f92e7e17503584f440e1eca0 (patch) | |
tree | 5d7b3963142f323287891f2263148f9a5792a08e /pkgs/desktops | |
parent | efa3fbab05840eb42047f233a6cca05cce206fb2 (diff) | |
parent | e09b963272f5ba0abccd4a9c25ad0c07b5a4b2c9 (diff) |
Merge pull request #235301 from bobby285271/upd/gnome
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome/games/gnome-mahjongg/default.nix | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix index e2d7d0729c6ca..4ca1a535f186e 100644 --- a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix @@ -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 ]; |