git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #95671 from dasj19/aisleriot-update

aisleriot: 3.22.9 -> 3.22.11

commitef5246f027d79d959fe00405c5c765e55b864e75 authorJan Tojnar <jtojnar@gmail.com> dateTue 18 Aug 2020, 11:10 (6 years ago) parent0657fe46e34cda
1 file changed+53−12
pkgs/desktops/gnome-3/games/aisleriot/default.nix+53−12
pkgs/desktops/gnome-3/games/aisleriot/default.nix+53−12
@@ -1,23 +1,64 @@
1−{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3
2−, wrapGAppsHook, librsvg, libxml2, desktop-file-utils
3−, guile_2_0, libcanberra-gtk3 }:
1+{ stdenv
2+, fetchFromGitLab
3+, pkg-config
4+, gnome3
5+, itstool
6+, gtk3
7+, wrapGAppsHook
8+, meson
9+, librsvg
10+, libxml2
11+, desktop-file-utils
12+, pysolfc
13+, guile
14+, libcanberra-gtk3
15+, ninja
16+, appstream-glib
17+, yelp-tools
18+}:
419
520stdenv.mkDerivation rec {
621 pname = "aisleriot";
7− version = "3.22.9";
22+ version = "3.22.11";
823
9− src = fetchurl {
10− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "0yzdh9cw5cjjgvfh75bihl968czlgfmpmn1z0fdk88sgvpjgzwji";
24+ src = fetchFromGitLab {
25+ owner = "GNOME";
26+ repo = pname;
27+ domain = "gitlab.gnome.org";
28+ rev = "${version}";
29+ sha256 = "1asm0y6485xqsysdg586y3hzz8bhxqwnc82k6vhfnxpxz7l62qa1";
1230 };
1331
14− configureFlags = [
15− "--with-card-theme-formats=svg"
16− "--with-platform=gtk-only" # until they remove GConf
32+ nativeBuildInputs = [
33+ wrapGAppsHook
34+ meson
35+ ninja
36+ appstream-glib
37+ pkg-config
38+ itstool
39+ libxml2
40+ desktop-file-utils
41+ yelp-tools
1742 ];
1843
19− nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 desktop-file-utils ];
20− buildInputs = [ gtk3 librsvg guile_2_0 libcanberra-gtk3 ];
44+ buildInputs = [
45+ gtk3
46+ librsvg
47+ guile
48+ libcanberra-gtk3
49+ pysolfc
50+ ];
51+
52+ prePatch = ''
53+ patchShebangs cards/meson_svgz.sh
54+ patchShebangs data/meson_desktopfile.py
55+ patchShebangs data/icons/meson_updateiconcache.py
56+ patchShebangs src/lib/meson_compileschemas.py
57+ '';
58+
59+ mesonFlags = [
60+ "-Dtheme_kde=false"
61+ ];
2162
2263 passthru = {
2364 updateScript = gnome3.updateScript {