summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3/games
diff options
context:
space:
mode:
authorPiotr Bogdan <ppbogdan@gmail.com>2020-08-25 08:30:47 +0100
committerJan Tojnar <jtojnar@gmail.com>2020-10-24 01:15:05 +0200
commit9d016e63937b71935de0d23c1ad537c53b450365 (patch)
treec4108d22e5246076fcccde01468c04b8aa3402bf /pkgs/desktops/gnome-3/games
parenta0024ddc42cb094170a7cd0a82e2b3be519b28de (diff)
downloadnixpkgs-9d016e63937b71935de0d23c1ad537c53b450365.tar
nixpkgs-9d016e63937b71935de0d23c1ad537c53b450365.tar.gz
nixpkgs-9d016e63937b71935de0d23c1ad537c53b450365.tar.bz2
nixpkgs-9d016e63937b71935de0d23c1ad537c53b450365.tar.lz
nixpkgs-9d016e63937b71935de0d23c1ad537c53b450365.tar.xz
nixpkgs-9d016e63937b71935de0d23c1ad537c53b450365.tar.zst
nixpkgs-9d016e63937b71935de0d23c1ad537c53b450365.zip
gnome3.gnome-mahjongg: 3.36.2 -> 3.38.1
Changelogs:
- https://ftp.gnome.org/pub/GNOME/sources/gnome-mahjongg/3.38/gnome-mahjongg-3.38.0.news
- https://ftp.gnome.org/pub/GNOME/sources/gnome-mahjongg/3.38/gnome-mahjongg-3.38.1.news

Signed-off-by: Jan Tojnar <jtojnar@gmail.com>
Diffstat (limited to 'pkgs/desktops/gnome-3/games')
-rw-r--r--pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix32
1 files changed, 18 insertions, 14 deletions
diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index fc706b89f1d..5a0a5873e26 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
@@ -1,41 +1,45 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
 , librsvg, gettext, itstool, libxml2
-, meson, ninja, python3, vala, desktop-file-utils
+, meson, ninja, glib, vala, desktop-file-utils
 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-mahjongg";
-  version = "3.36.2";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "15xfp2acqdnn0pcwg5d77dpv758jjyclwb042wm12gg07rbg3s6j";
-  };
-
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-mahjongg"; attrPath = "gnome3.gnome-mahjongg"; };
+    sha256 = "N0LcYxD8M/NewYfwJpnfIDzVb27pS0Hz7vJdrinutkc=";
   };
 
   nativeBuildInputs = [
-    meson ninja vala python3 desktop-file-utils
+    meson ninja vala desktop-file-utils
     pkgconfig gnome3.adwaita-icon-theme
     libxml2 itstool gettext wrapGAppsHook
+    glib # for glib-compile-schemas
   ];
   buildInputs = [
-    gtk3 librsvg
+    glib
+    gtk3
+    librsvg
   ];
 
-  postPatch = ''
-    chmod +x data/meson_post_install.py
-    patchShebangs data/meson_post_install.py
-  '';
+  mesonFlags = [
+    "-Dcompile-schemas=enabled"
+  ];
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = "https://wiki.gnome.org/Apps/Mahjongg";
     description = "Disassemble a pile of tiles by removing matching pairs";
     maintainers = teams.gnome.members;
-    license = licenses.gpl2;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };
 }