From 3eb83599aef7e39b4e60f3f1bf2f5b30f133762b Mon Sep 17 00:00:00 2001 From: sodiboo Date: Sat, 22 Jun 2024 05:36:29 +0200 Subject: [PATCH 1/3] wootility: add sodiboo as maintainer --- pkgs/tools/misc/wootility/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index 0a376aaf782d..41734276dbeb 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -32,7 +32,7 @@ appimageTools.wrapType2 rec { description = "Customization and management software for Wooting keyboards"; platforms = [ "x86_64-linux" ]; license = "unknown"; - maintainers = with maintainers; [ davidtwco ]; + maintainers = with maintainers; [ davidtwco sodiboo ]; mainProgram = "wootility"; }; } From 0f9c4bfe940ab7a03f7076a7f8b623f37f50ae51 Mon Sep 17 00:00:00 2001 From: sodiboo Date: Sat, 22 Jun 2024 05:03:07 +0200 Subject: [PATCH 2/3] wootility: add NIXOS_OZONE_WL, wootility-lekker.desktop, icons --- pkgs/tools/misc/wootility/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index 41734276dbeb..9cf6d5388803 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -4,6 +4,7 @@ , xorg , udev , wooting-udev-rules +, makeWrapper }: appimageTools.wrapType2 rec { @@ -15,6 +16,20 @@ appimageTools.wrapType2 rec { sha256 = "sha256-JodmF3TThPpXXx1eOnYmYAJ4x5Ylcf35bw3R++5/Buk="; }; + extraInstallCommands = + let contents = appimageTools.extract { inherit pname version src; }; + in '' + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/wootility \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + + install -Dm444 ${contents}/wootility-lekker.desktop -t $out/share/applications + install -Dm444 ${contents}/wootility-lekker.png -t $out/share/pixmaps + substituteInPlace $out/share/applications/wootility-lekker.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=wootility' \ + --replace-warn 'Name=wootility-lekker' 'Name=Wootility' + ''; + profile = '' export LC_ALL=C.UTF-8 ''; From 7663ec0316c813cf79ca5a69fc695e7a39f6c30e Mon Sep 17 00:00:00 2001 From: sodiboo Date: Sun, 23 Jun 2024 02:30:13 +0200 Subject: [PATCH 3/3] wootility: set license to unfree Co-authored-by: Aleksana --- pkgs/tools/misc/wootility/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index 9cf6d5388803..c5477bb83844 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -46,7 +46,7 @@ appimageTools.wrapType2 rec { homepage = "https://wooting.io/wootility"; description = "Customization and management software for Wooting keyboards"; platforms = [ "x86_64-linux" ]; - license = "unknown"; + license = licenses.unfree; maintainers = with maintainers; [ davidtwco sodiboo ]; mainProgram = "wootility"; };