Skip to content

Commit 44cdbd3

Browse files
committed
lutris: migrate to the new meson build system
This commit makes the Lutris package use the meson build system, which is more appropriate to build the desktop app. Indeed, the meson build of Lutris is the only one supporting translations for the desktop app. However, the presence of the Makefile at the source root is preventing the Nix build system from building the package with meson without overriding the different build phases.
1 parent 0f36a1a commit 44cdbd3

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

pkgs/applications/misc/lutris/default.nix

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# build inputs
77
atk,
88
file,
9+
glib,
910
gdk-pixbuf,
1011
glib-networking,
1112
gnome-desktop,
@@ -16,6 +17,8 @@
1617
pango,
1718
webkitgtk_4_1,
1819
wrapGAppsHook3,
20+
meson,
21+
ninja,
1922

2023
# check inputs
2124
xvfb-run,
@@ -45,11 +48,15 @@
4548
pulseaudio,
4649
p7zip,
4750
xgamma,
51+
gettext,
4852
libstrangle,
4953
fluidsynth,
5054
xorgserver,
5155
xorg,
5256
util-linux,
57+
pkg-config,
58+
desktop-file-utils,
59+
appstream-glib,
5360
}:
5461

5562
let
@@ -83,9 +90,18 @@ buildPythonApplication rec {
8390
hash = "sha256-CAXKnx5+60MITRM8enkYgFl5ZKM6HCXhCYNyG7kHhuQ=";
8491
};
8592

93+
format = "other";
94+
8695
nativeBuildInputs = [
87-
wrapGAppsHook3
96+
appstream-glib
97+
desktop-file-utils
98+
gettext
99+
glib
88100
gobject-introspection
101+
meson
102+
ninja
103+
wrapGAppsHook3
104+
pkg-config
89105
];
90106
buildInputs =
91107
[
@@ -128,20 +144,6 @@ buildPythonApplication rec {
128144
--replace '"libmagic.so.1"' "'${lib.getLib file}/lib/libmagic.so.1'"
129145
'';
130146

131-
nativeCheckInputs = [
132-
xvfb-run
133-
nose2
134-
flake8
135-
] ++ requiredTools;
136-
checkPhase = ''
137-
runHook preCheck
138-
139-
export HOME=$PWD
140-
xvfb-run -s '-screen 0 800x600x24' make test
141-
142-
runHook postCheck
143-
'';
144-
145147
# avoid double wrapping
146148
dontWrapGApps = true;
147149
makeWrapperArgs = [

pkgs/top-level/all-packages.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13207,7 +13207,9 @@ with pkgs;
1320713207

1320813208
luddite = with python3Packages; toPythonApplication luddite;
1320913209

13210-
lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { };
13210+
lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris {
13211+
inherit (pkgs) meson;
13212+
};
1321113213
lutris = callPackage ../applications/misc/lutris/fhsenv.nix { };
1321213214
lutris-free = lutris.override {
1321313215
steamSupport = false;

0 commit comments

Comments
 (0)