diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index 33dd9de1b423..d29ac55ce280 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -1,17 +1,60 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, glib, gtk3, gnome3, desktop-file-utils -, clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook, python3 }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, vala +, glib +, gtk3 +, libgnome-games-support +, gnome3 +, desktop-file-utils +, clutter +, clutter-gtk +, gettext +, itstool +, libxml2 +, wrapGAppsHook +, python3 +}: -let +stdenv.mkDerivation rec { pname = "swell-foop"; - version = "3.34.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1032psxm59nissi268bh3j964m4a0n0ah4dy1pf0ph27j3zvdik1"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "17r4b0g8s7z872wdd7ngk248z7fqx43vm2sym1bdqhzsi250s1y1"; }; + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + wrapGAppsHook + python3 + itstool + gettext + libxml2 + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk3 + libgnome-games-support + gnome3.adwaita-icon-theme + clutter + clutter-gtk + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -19,14 +62,6 @@ in stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ meson ninja vala pkg-config wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ]; - buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme clutter clutter-gtk ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; description = "Puzzle game, previously known as Same GNOME";