Merge pull request 'clan-vm-manager, clan-app: Make executable icon work in process overview' (#1797) from Qubasa/clan-core:Qubasa-main into main
|
Before Width: | Height: | Size: 108 KiB |
|
Before Width: | Height: | Size: 106 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
After Width: | Height: | Size: 375 B |
|
After Width: | Height: | Size: 717 B |
|
After Width: | Height: | Size: 717 B |
|
After Width: | Height: | Size: 1.5 KiB |
@@ -25,7 +25,7 @@ let
|
|||||||
desktop-file = makeDesktopItem {
|
desktop-file = makeDesktopItem {
|
||||||
name = "org.clan.vm-manager";
|
name = "org.clan.vm-manager";
|
||||||
exec = "clan-vm-manager %u";
|
exec = "clan-vm-manager %u";
|
||||||
icon = ./clan_vm_manager/assets/clan_white.png;
|
icon = "clan-white";
|
||||||
desktopName = "Clan Manager";
|
desktopName = "Clan Manager";
|
||||||
startupWMClass = "clan";
|
startupWMClass = "clan";
|
||||||
mimeTypes = [ "x-scheme-handler/clan" ];
|
mimeTypes = [ "x-scheme-handler/clan" ];
|
||||||
@@ -141,6 +141,11 @@ python3.pkgs.buildPythonApplication rec {
|
|||||||
passthru.runtimeDependencies = runtimeDependencies;
|
passthru.runtimeDependencies = runtimeDependencies;
|
||||||
passthru.testDependencies = testDependencies;
|
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.
|
# 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.
|
# It can be very confusing if you `nix run` than load the cli from the devshell instead.
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ if [ "$ALREADY_INSTALLED" = "true" ]; then
|
|||||||
echo "Upgrading installed clan-vm-manager"
|
echo "Upgrading installed clan-vm-manager"
|
||||||
nix profile upgrade clan-vm-manager
|
nix profile upgrade clan-vm-manager
|
||||||
else
|
else
|
||||||
nix profile install .#clan-vm-manager
|
nix profile install .#clan-vm-manager --priority 4
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|||||||