pyrox.dev
Merge pull request #165428 from bobby285271/gnome-tetravex
gnome.gnome-tetravex: fix build with meson 0.61
authored by
Bobby Rong
and committed by
GitHub
79fc85e9
9720a6b4
+45
-8
pkgs/desktops/gnome/games/gnome-tetravex/default.nix
+45
-8
pkgs/desktops/gnome/games/gnome-tetravex/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook
2
-
, libxml2, gettext, itstool, meson, ninja, python3
3
-
, vala, desktop-file-utils
4
}:
5
6
stdenv.mkDerivation rec {
···
12
sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z";
13
};
14
15
-
passthru = {
16
-
updateScript = gnome.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome.gnome-tetravex"; };
17
-
};
18
19
nativeBuildInputs = [
20
-
wrapGAppsHook itstool libxml2 gnome.adwaita-icon-theme
21
-
pkg-config gettext meson ninja python3 vala desktop-file-utils
22
];
23
buildInputs = [
24
gtk3
25
];
···
28
chmod +x build-aux/meson_post_install.py
29
patchShebangs build-aux/meson_post_install.py
30
'';
31
32
meta = with lib; {
33
homepage = "https://wiki.gnome.org/Apps/Tetravex";
···
1
+
{ stdenv
2
+
, lib
3
+
, fetchurl
4
+
, fetchpatch
5
+
, pkg-config
6
+
, gnome
7
+
, gtk3
8
+
, wrapGAppsHook
9
+
, libxml2
10
+
, gettext
11
+
, itstool
12
+
, meson
13
+
, ninja
14
+
, python3
15
+
, vala
16
+
, desktop-file-utils
17
}:
18
19
stdenv.mkDerivation rec {
···
25
sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z";
26
};
27
28
+
patches = [
29
+
# Fix build with meson 0.61
30
+
# data/meson.build:37:0: ERROR: Function does not take positional arguments.
31
+
# data/meson.build:59:0: ERROR: Function does not take positional arguments.
32
+
# Taken from https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20
33
+
(fetchpatch {
34
+
url = "https://gitlab.gnome.org/GNOME/gnome-tetravex/-/commit/80912d06f5e588f6aca966fa516103275e58d94e.patch";
35
+
sha256 = "2+nFw5sJzbInibKaq3J10Ufbl3CnZWlgnUtzRTZ5G0I=";
36
+
})
37
+
];
38
39
nativeBuildInputs = [
40
+
wrapGAppsHook
41
+
itstool
42
+
libxml2
43
+
gnome.adwaita-icon-theme
44
+
pkg-config
45
+
gettext
46
+
meson
47
+
ninja
48
+
python3
49
+
vala
50
+
desktop-file-utils
51
];
52
+
53
buildInputs = [
54
gtk3
55
];
···
58
chmod +x build-aux/meson_post_install.py
59
patchShebangs build-aux/meson_post_install.py
60
'';
61
+
62
+
passthru = {
63
+
updateScript = gnome.updateScript {
64
+
packageName = "gnome-tetravex";
65
+
attrPath = "gnome.gnome-tetravex";
66
+
};
67
+
};
68
69
meta = with lib; {
70
homepage = "https://wiki.gnome.org/Apps/Tetravex";