lutris: cleanup, match attr and pname
This commit is contained in:
parent
d0955299de
commit
697f738354
@ -72,21 +72,9 @@ let
|
|||||||
# bypass mount suid wrapper which does not work in fhsenv
|
# bypass mount suid wrapper which does not work in fhsenv
|
||||||
util-linux
|
util-linux
|
||||||
];
|
];
|
||||||
|
|
||||||
binPath = lib.makeBinPath requiredTools;
|
|
||||||
|
|
||||||
gstDeps = with gst_all_1; [
|
|
||||||
gst-libav
|
|
||||||
gst-plugins-bad
|
|
||||||
gst-plugins-base
|
|
||||||
gst-plugins-good
|
|
||||||
gst-plugins-ugly
|
|
||||||
gstreamer
|
|
||||||
];
|
|
||||||
|
|
||||||
in
|
in
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "lutris-original";
|
pname = "lutris-unwrapped";
|
||||||
version = "0.5.12";
|
version = "0.5.12";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
@ -107,7 +95,14 @@ buildPythonApplication rec {
|
|||||||
libnotify
|
libnotify
|
||||||
pango
|
pango
|
||||||
webkitgtk
|
webkitgtk
|
||||||
] ++ gstDeps;
|
] ++ (with gst_all_1; [
|
||||||
|
gst-libav
|
||||||
|
gst-plugins-bad
|
||||||
|
gst-plugins-base
|
||||||
|
gst-plugins-good
|
||||||
|
gst-plugins-ugly
|
||||||
|
gstreamer
|
||||||
|
]);
|
||||||
|
|
||||||
# See `install_requires` in https://github.com/lutris/lutris/blob/master/setup.py
|
# See `install_requires` in https://github.com/lutris/lutris/blob/master/setup.py
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
@ -128,19 +123,20 @@ buildPythonApplication rec {
|
|||||||
--replace "'libmagic.so.1'" "'${lib.getLib file}/lib/libmagic.so.1'"
|
--replace "'libmagic.so.1'" "'${lib.getLib file}/lib/libmagic.so.1'"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
checkInputs = [ xvfb-run nose2 flake8 ] ++ requiredTools;
|
checkInputs = [ xvfb-run nose2 flake8 ] ++ requiredTools;
|
||||||
preCheck = "export HOME=$PWD";
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
runHook preCheck
|
runHook preCheck
|
||||||
|
|
||||||
|
export HOME=$PWD
|
||||||
xvfb-run -s '-screen 0 800x600x24' make test
|
xvfb-run -s '-screen 0 800x600x24' make test
|
||||||
|
|
||||||
runHook postCheck
|
runHook postCheck
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# avoid double wrapping
|
# avoid double wrapping
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
makeWrapperArgs = [
|
makeWrapperArgs = [
|
||||||
"--prefix PATH : ${binPath}"
|
"--prefix PATH : ${lib.makeBinPath requiredTools}"
|
||||||
"\${gappsWrapperArgs[@]}"
|
"\${gappsWrapperArgs[@]}"
|
||||||
];
|
];
|
||||||
# needed for glib-schemas to work correctly (will crash on dialogues otherwise)
|
# needed for glib-schemas to work correctly (will crash on dialogues otherwise)
|
||||||
|
Loading…
Reference in New Issue
Block a user