solaar: fix g-i and double wrapping

This commit is contained in:
Sandro Jäckel 2022-08-05 23:31:11 +02:00
parent cd6e5884c7
commit c0bf3e53b1
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5

View file

@ -25,12 +25,19 @@ python3Packages.buildPythonApplication rec {
outputs = [ "out" "udev" ]; outputs = [ "out" "udev" ];
nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ]; nativeBuildInputs = [
buildInputs = [ libappindicator librsvg ]; gdk-pixbuf
gobject-introspection
wrapGAppsHook
];
buildInputs = [
libappindicator
librsvg
];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
evdev evdev
gobject-introspection
gtk3 gtk3
psutil psutil
pygobject3 pygobject3
@ -47,6 +54,17 @@ python3Packages.buildPythonApplication rec {
install -Dm444 -t $udev/etc/udev/rules.d rules.d-uinput/*.rules install -Dm444 -t $udev/etc/udev/rules.d rules.d-uinput/*.rules
''; '';
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
# no tests
doCheck = false;
pythonImportsCheck = [ "solaar" ];
meta = with lib; { meta = with lib; {
description = "Linux devices manager for the Logitech Unifying Receiver"; description = "Linux devices manager for the Logitech Unifying Receiver";
longDescription = '' longDescription = ''