From f1619a64863a565092aa077ade21b6eaf65fab36 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 25 Feb 2025 06:53:36 +0800 Subject: [PATCH 1/2] razergenie: remove with lib and use finalAttrs --- pkgs/applications/misc/razergenie/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/razergenie/default.nix b/pkgs/applications/misc/razergenie/default.nix index ca5ac7f4a42e..2502acff9d95 100644 --- a/pkgs/applications/misc/razergenie/default.nix +++ b/pkgs/applications/misc/razergenie/default.nix @@ -12,18 +12,14 @@ includeMatrixDiscovery ? false, }: -let - version = "0.9.0"; +stdenv.mkDerivation (finalAttrs: { pname = "razergenie"; - -in -stdenv.mkDerivation { - inherit pname version; + version = "0.9.0"; src = fetchFromGitHub { owner = "z3ntu"; repo = "RazerGenie"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "17xlv26q8sdbav00wdm043449pg2424l3yaf8fvkc9rrlqkv13a4"; }; @@ -44,15 +40,15 @@ stdenv.mkDerivation { "-Dinclude_matrix_discovery=${lib.boolToString includeMatrixDiscovery}" ]; - meta = with lib; { + meta = { homepage = "https://github.com/z3ntu/RazerGenie"; description = "Qt application for configuring your Razer devices under GNU/Linux"; mainProgram = "razergenie"; - license = licenses.gpl3; - maintainers = with maintainers; [ + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ f4814n Mogria ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) From 95e7bb82fc4e91a95a7ab4a1c8520e934d0e4061 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 25 Feb 2025 07:20:04 +0800 Subject: [PATCH 2/2] razergenie: 0.9.0 -> 1.2.0 --- pkgs/applications/misc/razergenie/default.nix | 51 +++++++++++++++---- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/razergenie/default.nix b/pkgs/applications/misc/razergenie/default.nix index 2502acff9d95..04cd8c67714f 100644 --- a/pkgs/applications/misc/razergenie/default.nix +++ b/pkgs/applications/misc/razergenie/default.nix @@ -8,36 +8,67 @@ qtbase, qttools, wrapQtAppsHook, - enableExperimental ? false, - includeMatrixDiscovery ? false, + cmake, }: +let + libopenrazer = stdenv.mkDerivation (finalAttrs: { + pname = "libopenrazer"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "z3ntu"; + repo = "libopenrazer"; + tag = "v${finalAttrs.version}"; + hash = "sha256-bU8Zsm/hM4HbPcoD191zwxU3x7f0i51evtVeD4jqw0U="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + buildInputs = [ + qtbase + qttools + ]; + + dontWrapQtApps = true; + + meta = { + homepage = "https://github.com/z3ntu/libopenrazer"; + description = "Qt wrapper around the D-Bus API from OpenRazer"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + }; + }); +in stdenv.mkDerivation (finalAttrs: { pname = "razergenie"; - version = "0.9.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "z3ntu"; repo = "RazerGenie"; - rev = "v${finalAttrs.version}"; - sha256 = "17xlv26q8sdbav00wdm043449pg2424l3yaf8fvkc9rrlqkv13a4"; + tag = "v${finalAttrs.version}"; + hash = "sha256-kw7/Qf6L63PBuyq3TfgU2iGAKX0qLGiq6JgLnN+3tu4="; }; + postUnpack = ''ln -s ${libopenrazer} libopenrazer''; + nativeBuildInputs = [ pkg-config meson ninja + cmake wrapQtAppsHook ]; buildInputs = [ qtbase qttools - ]; - - mesonFlags = [ - "-Denable_experimental=${lib.boolToString enableExperimental}" - "-Dinclude_matrix_discovery=${lib.boolToString includeMatrixDiscovery}" + libopenrazer ]; meta = {