From 3ccee00df1fa8a17dce3037213dbff111b9359f3 Mon Sep 17 00:00:00 2001 From: Joshua Giacone <71910145+jrgiacone@users.noreply.github.com> Date: Sun, 27 Nov 2022 17:26:24 -0800 Subject: [PATCH] polychromatic: fix qt5 wrapper to contain all required libraries (#202449) Co-authored-by: Sandro Fixes https://github.com/NixOS/nixpkgs/issues/200780 --- .../misc/polychromatic/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index fc6b6a1e2d4a..42143cbc9772 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -10,8 +10,12 @@ , sassc , python3Packages , gobject-introspection -, gtk3 , wrapGAppsHook +, libappindicator-gtk3 +, libxcb +, qt5 +, ibus +, usbutils }: python3Packages.buildPythonApplication rec { @@ -28,11 +32,9 @@ python3Packages.buildPythonApplication rec { postPatch = '' patchShebangs scripts - substituteInPlace scripts/build-styles.sh \ --replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \ --replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass' - substituteInPlace pylib/common.py \ --replace "/usr/share/polychromatic" "$out/share/polychromatic" ''; @@ -40,7 +42,6 @@ python3Packages.buildPythonApplication rec { preConfigure = '' scripts/build-styles.sh ''; - nativeBuildInputs = with python3Packages; [ gettext gobject-introspection @@ -48,18 +49,22 @@ python3Packages.buildPythonApplication rec { ninja sassc wrapGAppsHook + qt5.wrapQtAppsHook ]; propagatedBuildInputs = with python3Packages; [ colorama colour - gtk3 openrazer - pygobject3 pyqt5 pyqtwebengine requests setproctitle + libxcb + openrazer-daemon + libappindicator-gtk3 + ibus + usbutils ]; dontWrapGapps = true; @@ -67,6 +72,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" + "\${qtWrapperArgs[@]}" ]; meta = with lib; {