From c912d30f6505fa3ceb0a1a1cd28f66086a386101 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 22 May 2021 15:58:56 +0000 Subject: [PATCH] =?UTF-8?q?gnome.tali:=2040.0=20=E2=86=92=2040.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tali/-/compare/40.0...40.1 Also correct the license and format the expression. --- pkgs/desktops/gnome/games/tali/default.nix | 59 +++++++++++++++++----- 1 file changed, 45 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix index 3e2abc87304..0212aebd8c5 100644 --- a/pkgs/desktops/gnome/games/tali/default.nix +++ b/pkgs/desktops/gnome/games/tali/default.nix @@ -1,38 +1,69 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, gdk-pixbuf -, librsvg, libgnome-games-support, gettext, itstool, libxml2, wrapGAppsHook -, meson, ninja, python3, desktop-file-utils +{ + lib, + stdenv, + fetchurl, + pkg-config, + gtk3, + gnome, + gdk-pixbuf, + librsvg, + libgnome-games-support, + gettext, + itstool, + libxml2, + wrapGAppsHook, + meson, + ninja, + python3, + desktop-file-utils, }: stdenv.mkDerivation rec { pname = "tali"; - version = "40.0"; + version = "40.1"; src = fetchurl { url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "19gic6yjg3bg6jf87zvhm7ihsz1y58dz86p4x3a16xdhjyrk40q2"; - }; - - passthru = { - updateScript = gnome.updateScript { packageName = "tali"; attrPath = "gnome.tali"; }; + sha256 = "1xhp30c70bi8p4sm6v8zmxi1p55fs56dqgfbhfnsda5g1cxwir7h"; }; nativeBuildInputs = [ - meson ninja python3 desktop-file-utils - pkg-config gnome.adwaita-icon-theme - libxml2 itstool gettext wrapGAppsHook + meson + ninja + python3 + desktop-file-utils + pkg-config + gnome.adwaita-icon-theme + libxml2 + itstool + gettext + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + gdk-pixbuf + librsvg + libgnome-games-support ]; - buildInputs = [ gtk3 gdk-pixbuf librsvg libgnome-games-support ]; postPatch = '' chmod +x build-aux/meson_post_install.py patchShebangs build-aux/meson_post_install.py ''; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Tali"; description = "Sort of poker with dice and less money"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; }