From 0d8fe4b47638fcaf77a0c908c834388e6aa8783f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 27 May 2024 00:16:20 +0200
Subject: [PATCH 1/2] python311Packages.openrazer: fix indentation
---
.../python-modules/openrazer/daemon.nix | 67 +++++++++----------
1 file changed, 32 insertions(+), 35 deletions(-)
diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix
index fb23b17b3261..447f2976d2e4 100644
--- a/pkgs/development/python-modules/openrazer/daemon.nix
+++ b/pkgs/development/python-modules/openrazer/daemon.nix
@@ -18,46 +18,43 @@
let
common = import ./common.nix { inherit lib fetchFromGitHub; };
in
-buildPythonPackage (
- common
- // {
- pname = "openrazer-daemon";
+buildPythonPackage (common // {
+ pname = "openrazer-daemon";
- outputs = [
- "out"
- "man"
- ];
+ outputs = [
+ "out"
+ "man"
+ ];
- sourceRoot = "${common.src.name}/daemon";
+ sourceRoot = "${common.src.name}/daemon";
- postPatch = ''
- substituteInPlace openrazer_daemon/daemon.py \
- --replace-fail "plugdev" "openrazer"
- '';
+ postPatch = ''
+ substituteInPlace openrazer_daemon/daemon.py \
+ --replace-fail "plugdev" "openrazer"
+ '';
- nativeBuildInputs = [ setuptools ];
+ nativeBuildInputs = [ setuptools ];
- propagatedBuildInputs = [
- daemonize
- dbus-python
- gobject-introspection
- gtk3
- pygobject3
- pyudev
- setproctitle
- notify2
- ];
+ propagatedBuildInputs = [
+ daemonize
+ dbus-python
+ gobject-introspection
+ gtk3
+ pygobject3
+ pyudev
+ setproctitle
+ notify2
+ ];
- postInstall = ''
- DESTDIR="$out" PREFIX="" make manpages install-resources install-systemd
- '';
+ postInstall = ''
+ DESTDIR="$out" PREFIX="" make manpages install-resources install-systemd
+ '';
- # no tests run
- doCheck = false;
+ # no tests run
+ doCheck = false;
- meta = common.meta // {
- description = "An entirely open source user-space daemon that allows you to manage your Razer peripherals on GNU/Linux";
- mainProgram = "openrazer-daemon";
- };
- }
-)
+ meta = common.meta // {
+ description = "An entirely open source user-space daemon that allows you to manage your Razer peripherals on GNU/Linux";
+ mainProgram = "openrazer-daemon";
+ };
+})
From 9dd5cef4984e223cf2033406942156ef5442b5bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 27 May 2024 00:17:10 +0200
Subject: [PATCH 2/2] python311Packages.openrazer: fix gobjects, double
wrapping
---
pkgs/development/python-modules/openrazer/daemon.nix | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix
index 447f2976d2e4..6fafcec4a38b 100644
--- a/pkgs/development/python-modules/openrazer/daemon.nix
+++ b/pkgs/development/python-modules/openrazer/daemon.nix
@@ -6,12 +6,11 @@
fetchFromGitHub,
gobject-introspection,
gtk3,
- makeWrapper,
pygobject3,
pyudev,
setproctitle,
setuptools,
- wrapGAppsHook3,
+ wrapGAppsNoGuiHook,
notify2,
}:
@@ -33,7 +32,7 @@ buildPythonPackage (common // {
--replace-fail "plugdev" "openrazer"
'';
- nativeBuildInputs = [ setuptools ];
+ nativeBuildInputs = [ setuptools wrapGAppsNoGuiHook ];
propagatedBuildInputs = [
daemonize
@@ -53,6 +52,12 @@ buildPythonPackage (common // {
# no tests run
doCheck = false;
+ dontWrapGApps = true;
+
+ preFixup = ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
+
meta = common.meta // {
description = "An entirely open source user-space daemon that allows you to manage your Razer peripherals on GNU/Linux";
mainProgram = "openrazer-daemon";