diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome/games')
7 files changed, 109 insertions, 29 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome/games/aisleriot/default.nix b/nixpkgs/pkgs/desktops/gnome/games/aisleriot/default.nix index 21e38c548e98..5a7446862bdc 100644 --- a/nixpkgs/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitLab , nix-update-script , pkg-config @@ -9,8 +10,7 @@ , librsvg , libxml2 , desktop-file-utils -, pysolfc -, guile +, guile_3_0 , libcanberra-gtk3 , ninja , appstream-glib @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.20"; + version = "3.22.21"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = version; - sha256 = "sha256-5xFwlhT9qjtvNDQ8kfGd2BeK2KcJDzpfsEC8z4Ei3ns="; + sha256 = "sha256-dpzuePxSoJcwUlj314r5G9A8aF1Yz49r+DxNTfA8/Ks="; }; nativeBuildInputs = [ @@ -44,9 +44,8 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 librsvg - guile + guile_3_0 libcanberra-gtk3 - pysolfc ]; prePatch = '' diff --git a/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix b/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix index e47e77d9c0ab..5690355a0ce2 100644 --- a/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -14,16 +14,17 @@ , gnome , glib , gtk4 +, libadwaita , librsvg }: stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "41.1"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "62GYhlljlrQDOj8oo8LjAEtU6+Gzi0DWQiwXufLMF9A="; + sha256 = "Eq9Uk6YiBaxrt0VA8KhYQT2okolmo0boVDMLQdc7w5M="; }; nativeBuildInputs = [ @@ -42,8 +43,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk4 + libadwaita librsvg - gnome.adwaita-icon-theme ]; postPatch = '' diff --git a/nixpkgs/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix b/nixpkgs/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix index 7ef68e470e1d..698741ba8366 100644 --- a/nixpkgs/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix @@ -1,6 +1,20 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook -, librsvg, gettext, itstool, libxml2 -, meson, ninja, glib, vala, desktop-file-utils +{ stdenv +, lib +, fetchurl +, fetchpatch +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, librsvg +, gettext +, itstool +, libxml2 +, meson +, ninja +, glib +, vala +, desktop-file-utils }: stdenv.mkDerivation rec { @@ -12,12 +26,30 @@ stdenv.mkDerivation rec { sha256 = "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj"; }; + 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 + meson + ninja + vala + desktop-file-utils + pkg-config + gnome.adwaita-icon-theme + libxml2 + itstool + gettext + wrapGAppsHook glib # for glib-compile-schemas ]; + buildInputs = [ glib gtk3 diff --git a/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 1431a6179493..87e7c467d04c 100644 --- a/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "40.2"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NhIFMePHE5WB6jgA+/48KzFpTEQBRezIl6w05WLXVKM="; + sha256 = "HS603bgCa0Q2Rc81hbjfEkTjgo7hwHUYBSslmeHFwo8="; }; nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/desktops/gnome/games/gnome-tetravex/default.nix b/nixpkgs/pkgs/desktops/gnome/games/gnome-tetravex/default.nix index a1cdf98d9a15..6578bf7c0589 100644 --- a/nixpkgs/pkgs/desktops/gnome/games/gnome-tetravex/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/games/gnome-tetravex/default.nix @@ -1,6 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook -, libxml2, gettext, itstool, meson, ninja, python3 -, vala, desktop-file-utils +{ stdenv +, lib +, fetchurl +, fetchpatch +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, libxml2 +, gettext +, itstool +, meson +, ninja +, python3 +, vala +, desktop-file-utils }: stdenv.mkDerivation rec { @@ -12,14 +25,31 @@ stdenv.mkDerivation rec { sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z"; }; - passthru = { - updateScript = gnome.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome.gnome-tetravex"; }; - }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:37:0: ERROR: Function does not take positional arguments. + # data/meson.build:59:0: ERROR: Function does not take positional arguments. + # Taken from https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-tetravex/-/commit/80912d06f5e588f6aca966fa516103275e58d94e.patch"; + sha256 = "2+nFw5sJzbInibKaq3J10Ufbl3CnZWlgnUtzRTZ5G0I="; + }) + ]; nativeBuildInputs = [ - wrapGAppsHook itstool libxml2 gnome.adwaita-icon-theme - pkg-config gettext meson ninja python3 vala desktop-file-utils + wrapGAppsHook + itstool + libxml2 + gnome.adwaita-icon-theme + pkg-config + gettext + meson + ninja + python3 + vala + desktop-file-utils ]; + buildInputs = [ gtk3 ]; @@ -29,6 +59,13 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson_post_install.py ''; + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-tetravex"; + attrPath = "gnome.gnome-tetravex"; + }; + }; + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Tetravex"; description = "Complete the puzzle by matching numbered tiles"; diff --git a/nixpkgs/pkgs/desktops/gnome/games/hitori/default.nix b/nixpkgs/pkgs/desktops/gnome/games/hitori/default.nix index 15759c681984..bb210c2fffb1 100644 --- a/nixpkgs/pkgs/desktops/gnome/games/hitori/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/games/hitori/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -25,6 +27,15 @@ stdenv.mkDerivation rec { sha256 = "99cQPLBjP7ATcwExqYw646IWK5+5SZ/H8ZUS1YG/ZWk="; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:3:0: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/hitori/-/commit/d25728e122f1d7b985029a5ba96810c3e57c27f7.patch"; + sha256 = "LwBpFFr+vLacLTpto7PwvO1p2lku6epyEv9YZvUvW+g="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix b/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix index 936fe62c259b..c12853e5daee 100644 --- a/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "40.5"; + version = "40.6"; src = fetchurl { url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Y6CcVeRqGhl1a/XglXyvmUMA+tq9umvaYC5mjfzfcSI="; + sha256 = "g/ugR+3s0ZbTBxmnDi9NCYa7Jswr1flVoKkgDqY/BhI="; }; nativeBuildInputs = [ |