From f0c0ed1fa844fe77cb0a23bb68ec41b1717298b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 26 Nov 2023 19:28:39 -0500 Subject: [PATCH 1/2] chrysalis: fix icon location --- pkgs/applications/misc/chrysalis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix index f5c6da15bd99..cc59b97a0f2b 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -35,7 +35,7 @@ in appimageTools.wrapType2 rec { $out/share/applications/Chrysalis.desktop \ --replace 'Exec=Chrysalis' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share + install -Dm444 ${appimageContents}/usr/share/icons/hicolor/256x256/chrysalis.png -t $out/share/pixmaps ''; meta = with lib; { From 053b6492db0229ffeb2dba7e1f7608be72699f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 26 Nov 2023 19:29:43 -0500 Subject: [PATCH 2/2] chrysalis: correct license identifier --- pkgs/applications/misc/chrysalis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix index cc59b97a0f2b..bb445422d030 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -41,7 +41,7 @@ in appimageTools.wrapType2 rec { meta = with lib; { description = "A graphical configurator for Kaleidoscope-powered keyboards"; homepage = "https://github.com/keyboardio/Chrysalis"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ aw ]; platforms = [ "x86_64-linux" ]; mainProgram = pname;