Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Actually get the edopro package finished and installed #351

Merged
merged 3 commits into from
Jul 30, 2024
Merged

Actually get the edopro package finished and installed #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e043956
sources.nix: Fix broken hash
TLATER Jul 30, 2024
ca4d625
pkgs: Fix application icon sizes
TLATER Jul 30, 2024
ecd2545
personal: Add edopro to installed packages
TLATER Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions home-config/config/personal/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion pkgs/_sources/generated.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
fetchSubmodules = true;
deepClone = false;
leaveDotGit = true;
sha256 = "sha256-ojbN+QH1nS2NCXDp4kwvEKWTxU+PO94gs9hbTGM0i70=";
sha256 = "sha256-3I5gRE+TPcLjosb7azaY8ycq58SRqQC2qGC4fGSYza4=";
};
date = "2024-06-13";
};
Expand Down
8 changes: 6 additions & 2 deletions pkgs/applications/edopro.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
writeShellScriptBin,
makeDesktopItem,
symlinkJoin,
imagemagick,

# edopro deps
bzip2,
Expand Down Expand Up @@ -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
'';
}
8 changes: 6 additions & 2 deletions pkgs/applications/gcs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
buildGoModule,
buildNpmPackage,
pkg-config,
imagemagick,
libGL,
fontconfig,
freetype,
Expand Down Expand Up @@ -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}
'';
Expand Down