diff --git a/home-config/config/personal/default.nix b/home-config/config/personal/default.nix index daa0db93..261a7644 100644 --- a/home-config/config/personal/default.nix +++ b/home-config/config/personal/default.nix @@ -5,6 +5,7 @@ home.packages = with pkgs; [ prismlauncher flake-inputs.self.packages.${pkgs.system}.gcs + flake-inputs.self.packages.${pkgs.system}.edopro ]; programs.firefox.enableThirdPartyRepositories = true; diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index ffd1b9dc..185baeaa 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -53,7 +53,7 @@ fetchSubmodules = true; deepClone = false; leaveDotGit = true; - sha256 = "sha256-ojbN+QH1nS2NCXDp4kwvEKWTxU+PO94gs9hbTGM0i70="; + sha256 = "sha256-3I5gRE+TPcLjosb7azaY8ycq58SRqQC2qGC4fGSYza4="; }; date = "2024-06-13"; }; diff --git a/pkgs/applications/edopro.nix b/pkgs/applications/edopro.nix index 324e91cc..8eeaacb8 100644 --- a/pkgs/applications/edopro.nix +++ b/pkgs/applications/edopro.nix @@ -7,6 +7,7 @@ writeShellScriptBin, makeDesktopItem, symlinkJoin, + imagemagick, # edopro deps bzip2, @@ -169,7 +170,10 @@ symlinkJoin { ]; postBuild = '' - install -D ${sources.edopro-distribution.src}/textures/AppIcon.png \ - $out/share/icons/hicolor/1024x1024/apps/EDOPro.png + mkdir -p $out/share/icons/hicolor/256x256/apps/ + ${imagemagick}/bin/magick \ + ${sources.edopro-distribution.src}/textures/AppIcon.png \ + -resize 256x256 \ + $out/share/icons/hicolor/256x256/apps/EDOPro.png ''; } diff --git a/pkgs/applications/gcs.nix b/pkgs/applications/gcs.nix index a9873d2d..71d31850 100644 --- a/pkgs/applications/gcs.nix +++ b/pkgs/applications/gcs.nix @@ -5,6 +5,7 @@ buildGoModule, buildNpmPackage, pkg-config, + imagemagick, libGL, fontconfig, freetype, @@ -90,9 +91,12 @@ buildGoModule { ''; in '' - mkdir -p $out/share/{applications,icons/hicolor/1024x1024/apps} + mkdir -p $out/share/{applications,icons/hicolor/256x256/apps} echo -n '${desktop}' > $out/share/applications/com.trollworks.gcs.desktop - cp packaging/internal/embedded/app-1024.png $out/share/icons/hicolor/1024x1024/apps/gcs.png + ${imagemagick}/bin/magick \ + packaging/internal/embedded/app-1024.png \ + -resize 256x256 \ + $out/share/icons/hicolor/256x256/apps/gcs.png rm $out/bin/{gen,packaging,scr} '';