diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/clan_black.png b/pkgs/clan-vm-manager/clan_vm_manager/assets/clan_black.png deleted file mode 100644 index 370d0f751..000000000 Binary files a/pkgs/clan-vm-manager/clan_vm_manager/assets/clan_black.png and /dev/null differ diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/clan_white.png b/pkgs/clan-vm-manager/clan_vm_manager/assets/clan_white.png deleted file mode 100644 index b5bcb1456..000000000 Binary files a/pkgs/clan-vm-manager/clan_vm_manager/assets/clan_white.png and /dev/null differ diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/clan_white_notext.png b/pkgs/clan-vm-manager/clan_vm_manager/assets/white-favicons/128x128/apps/clan-white.png similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/assets/clan_white_notext.png rename to pkgs/clan-vm-manager/clan_vm_manager/assets/white-favicons/128x128/apps/clan-white.png diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/white-favicons/16x16/apps/clan-white.png b/pkgs/clan-vm-manager/clan_vm_manager/assets/white-favicons/16x16/apps/clan-white.png new file mode 100644 index 000000000..bf687ce9d Binary files /dev/null and b/pkgs/clan-vm-manager/clan_vm_manager/assets/white-favicons/16x16/apps/clan-white.png differ diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/white-favicons/32x32/apps/clan-white.png b/pkgs/clan-vm-manager/clan_vm_manager/assets/white-favicons/32x32/apps/clan-white.png new file mode 100644 index 000000000..2852ed674 Binary files /dev/null and b/pkgs/clan-vm-manager/clan_vm_manager/assets/white-favicons/32x32/apps/clan-white.png differ diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/white-favicons/48x48/apps/clan-white.png b/pkgs/clan-vm-manager/clan_vm_manager/assets/white-favicons/48x48/apps/clan-white.png new file mode 100644 index 000000000..2852ed674 Binary files /dev/null and b/pkgs/clan-vm-manager/clan_vm_manager/assets/white-favicons/48x48/apps/clan-white.png differ diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/white-favicons/64x64/apps/clan-white.png b/pkgs/clan-vm-manager/clan_vm_manager/assets/white-favicons/64x64/apps/clan-white.png new file mode 100644 index 000000000..39298fb7d Binary files /dev/null and b/pkgs/clan-vm-manager/clan_vm_manager/assets/white-favicons/64x64/apps/clan-white.png differ diff --git a/pkgs/clan-vm-manager/default.nix b/pkgs/clan-vm-manager/default.nix index 5852e6325..172fa0666 100644 --- a/pkgs/clan-vm-manager/default.nix +++ b/pkgs/clan-vm-manager/default.nix @@ -25,7 +25,7 @@ let desktop-file = makeDesktopItem { name = "org.clan.vm-manager"; exec = "clan-vm-manager %u"; - icon = ./clan_vm_manager/assets/clan_white.png; + icon = "clan-white"; desktopName = "Clan Manager"; startupWMClass = "clan"; mimeTypes = [ "x-scheme-handler/clan" ]; @@ -141,6 +141,11 @@ python3.pkgs.buildPythonApplication rec { passthru.runtimeDependencies = runtimeDependencies; passthru.testDependencies = testDependencies; + postInstall = '' + mkdir -p $out/share/icons/hicolor + cp -r ./clan_vm_manager/assets/white-favicons/* $out/share/icons/hicolor + ''; + # Don't leak python packages into a devshell. # It can be very confusing if you `nix run` than load the cli from the devshell instead. postFixup = '' diff --git a/pkgs/clan-vm-manager/install-desktop.sh b/pkgs/clan-vm-manager/install-desktop.sh index afa1c387e..48b9b566e 100755 --- a/pkgs/clan-vm-manager/install-desktop.sh +++ b/pkgs/clan-vm-manager/install-desktop.sh @@ -11,7 +11,7 @@ if [ "$ALREADY_INSTALLED" = "true" ]; then echo "Upgrading installed clan-vm-manager" nix profile upgrade clan-vm-manager else - nix profile install .#clan-vm-manager + nix profile install .#clan-vm-manager --priority 4 fi