Merge pull request #95671 from dasj19/aisleriot-update

aisleriot: 3.22.9 -> 3.22.11

Changed files
+53 -12
pkgs
desktops
gnome-3
games
aisleriot
+53 -12
pkgs/desktops/gnome-3/games/aisleriot/default.nix
···
-
{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3
-
, wrapGAppsHook, librsvg, libxml2, desktop-file-utils
-
, guile_2_0, libcanberra-gtk3 }:
stdenv.mkDerivation rec {
pname = "aisleriot";
-
version = "3.22.9";
-
src = fetchurl {
-
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-
sha256 = "0yzdh9cw5cjjgvfh75bihl968czlgfmpmn1z0fdk88sgvpjgzwji";
};
-
configureFlags = [
-
"--with-card-theme-formats=svg"
-
"--with-platform=gtk-only" # until they remove GConf
];
-
nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 desktop-file-utils ];
-
buildInputs = [ gtk3 librsvg guile_2_0 libcanberra-gtk3 ];
passthru = {
updateScript = gnome3.updateScript {
···
+
{ stdenv
+
, fetchFromGitLab
+
, pkg-config
+
, gnome3
+
, itstool
+
, gtk3
+
, wrapGAppsHook
+
, meson
+
, librsvg
+
, libxml2
+
, desktop-file-utils
+
, pysolfc
+
, guile
+
, libcanberra-gtk3
+
, ninja
+
, appstream-glib
+
, yelp-tools
+
}:
stdenv.mkDerivation rec {
pname = "aisleriot";
+
version = "3.22.11";
+
src = fetchFromGitLab {
+
owner = "GNOME";
+
repo = pname;
+
domain = "gitlab.gnome.org";
+
rev = "${version}";
+
sha256 = "1asm0y6485xqsysdg586y3hzz8bhxqwnc82k6vhfnxpxz7l62qa1";
};
+
nativeBuildInputs = [
+
wrapGAppsHook
+
meson
+
ninja
+
appstream-glib
+
pkg-config
+
itstool
+
libxml2
+
desktop-file-utils
+
yelp-tools
];
+
buildInputs = [
+
gtk3
+
librsvg
+
guile
+
libcanberra-gtk3
+
pysolfc
+
];
+
+
prePatch = ''
+
patchShebangs cards/meson_svgz.sh
+
patchShebangs data/meson_desktopfile.py
+
patchShebangs data/icons/meson_updateiconcache.py
+
patchShebangs src/lib/meson_compileschemas.py
+
'';
+
+
mesonFlags = [
+
"-Dtheme_kde=false"
+
];
passthru = {
updateScript = gnome3.updateScript {