From 6d4543d9d338efd381abf786f23f6164fde70ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 6 Jun 2024 02:05:59 +0200 Subject: [PATCH 1/3] polychromatic: misc cosmetic cleanups --- .../misc/polychromatic/default.nix | 50 ++++++++----------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index 2a7386acc624..54c932526e70 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -1,11 +1,7 @@ { lib, fetchFromGitHub, - bash, - glib, - gdk-pixbuf, gettext, - imagemagick, ninja, meson, sassc, @@ -29,22 +25,23 @@ python3Packages.buildPythonApplication rec { owner = "polychromatic"; repo = "polychromatic"; rev = "v${version}"; - sha256 = "sha256-3Pt1Z8G0xDWlFD7LxJILPUifMBTN4OvPNHZv80umO1s="; + hash = "sha256-3Pt1Z8G0xDWlFD7LxJILPUifMBTN4OvPNHZv80umO1s="; }; 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' + --replace-fail '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \ + --replace-fail '$(which sass 2>/dev/null)' '${sassc}/bin/sass' substituteInPlace polychromatic/paths.py \ - --replace "/usr/share/polychromatic" "$out/share/polychromatic" + --replace-fail "/usr/share/polychromatic" "$out/share/polychromatic" ''; preConfigure = '' scripts/build-styles.sh ''; - nativeBuildInputs = with python3Packages; [ + + nativeBuildInputs = [ gettext gobject-introspection meson @@ -57,25 +54,22 @@ python3Packages.buildPythonApplication rec { buildInputs = [ qt6.qtwayland ]; - propagatedBuildInputs = - with python3Packages; - [ - colorama - colour - openrazer - pyqt6 - pyqt6-webengine - requests - setproctitle - libxcb - openrazer-daemon - ibus - usbutils - ] - ++ [ - libayatana-appindicator - psmisc - ]; + propagatedBuildInputs = with python3Packages; [ + colorama + colour + openrazer + pyqt6 + pyqt6-webengine + requests + setproctitle + libxcb + openrazer-daemon + ibus + usbutils + ] ++ [ + libayatana-appindicator + psmisc + ]; dontWrapGapps = true; dontWrapQtApps = true; From 77dc9fc2e7b04d80202fa0a3a91a3853f4dc0f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 6 Jun 2024 02:06:10 +0200 Subject: [PATCH 2/3] polychromatic: fix typo that caused double wrapping --- pkgs/applications/misc/polychromatic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index 54c932526e70..326ce11b7cd5 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -71,7 +71,7 @@ python3Packages.buildPythonApplication rec { psmisc ]; - dontWrapGapps = true; + dontWrapGApps = true; dontWrapQtApps = true; makeWrapperArgs = [ From b7ddce075b871bc7030dc7c5bfbb44cd59606f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 6 Jun 2024 02:06:22 +0200 Subject: [PATCH 3/3] polychromatic: set meta.mainProgram --- pkgs/applications/misc/polychromatic/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index 326ce11b7cd5..a6079c11b986 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -89,5 +89,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ evanjs ]; + mainProgram = "polychromatic-controller"; }; }