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

keyboard-layout-editor: fix dependencies for all platforms #366098

Merged
merged 1 commit into from
Dec 18, 2024
+51 −3
Merged

keyboard-layout-editor: fix dependencies for all platforms #366098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 36 additions & 0 deletions pkgs/by-name/ke/keyboard-layout-editor/deps.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 15 additions & 3 deletions pkgs/by-name/ke/keyboard-layout-editor/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@ stdenv.mkDerivation rec {
wrapGAppsHook3
];

gradleUpdateScript = ''
runHook preBuild

gradle nixDownloadDeps -Dos.family=linux -Dos.arch=amd64
gradle nixDownloadDeps -Dos.family=linux -Dos.arch=aarch64
gradle nixDownloadDeps -Dos.name='mac os x' -Dos.arch=amd64
gradle nixDownloadDeps -Dos.name='mac os x' -Dos.arch=aarch64
'';

mitmCache = gradle_8.fetchDeps {
inherit pname;
data = ./deps.json;
Expand Down Expand Up @@ -66,8 +75,11 @@ stdenv.mkDerivation rec {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fliegendewurst ];
mainProgram = "keyboard-layout-editor";
platforms = jdk.meta.platforms;
# gradle resolves platform-specific dependencies
broken = stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isDarwin;
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
};
}
Loading