pyrox.dev
Merge pull request #165446 from bobby285271/gnome-mahjongg
gnome.gnome-mahjongg: fix build with meson 0.61
authored by
Bobby Rong
and committed by
GitHub
6dd4a7d8
78d836f8
+38
-6
pkgs/desktops/gnome/games/gnome-mahjongg/default.nix
+38
-6
pkgs/desktops/gnome/games/gnome-mahjongg/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook
2
-
, librsvg, gettext, itstool, libxml2
3
-
, meson, ninja, glib, vala, desktop-file-utils
1
+
{ stdenv
2
+
, lib
3
+
, fetchurl
4
+
, fetchpatch
5
+
, pkg-config
6
+
, gnome
7
+
, gtk3
8
+
, wrapGAppsHook
9
+
, librsvg
10
+
, gettext
11
+
, itstool
12
+
, libxml2
13
+
, meson
14
+
, ninja
15
+
, glib
16
+
, vala
17
+
, desktop-file-utils
4
18
}:
5
19
6
20
stdenv.mkDerivation rec {
···
12
26
sha256 = "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj";
13
27
};
14
28
29
+
patches = [
30
+
# Fix build with meson 0.61
31
+
# data/meson.build:24:0: ERROR: Function does not take positional arguments.
32
+
# data/meson.build:45:0: ERROR: Function does not take positional arguments.
33
+
(fetchpatch {
34
+
url = "https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/commit/a2037b0747163601a5d5b57856d037eecf3a4db7.patch";
35
+
sha256 = "Wcder6Y9H6c1f8I+IPDvST3umaCU21HgxfXn809JDz0=";
36
+
})
37
+
];
38
+
15
39
nativeBuildInputs = [
16
-
meson ninja vala desktop-file-utils
17
-
pkg-config gnome.adwaita-icon-theme
18
-
libxml2 itstool gettext wrapGAppsHook
40
+
meson
41
+
ninja
42
+
vala
43
+
desktop-file-utils
44
+
pkg-config
45
+
gnome.adwaita-icon-theme
46
+
libxml2
47
+
itstool
48
+
gettext
49
+
wrapGAppsHook
19
50
glib # for glib-compile-schemas
20
51
];
52
+
21
53
buildInputs = [
22
54
glib
23
55
gtk3