Skip to content

Commit

Permalink
keyboard-layout-editor: fix dependencies for all platforms
Browse files Browse the repository at this point in the history
  • Loading branch information
FliegendeWurst committed Dec 18, 2024
1 parent e966ecd commit 8bf27e4
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 3 deletions.
36 changes: 36 additions & 0 deletions pkgs/by-name/ke/keyboard-layout-editor/deps.json

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

13 changes: 10 additions & 3 deletions pkgs/by-name/ke/keyboard-layout-editor/package.nix
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,6 @@ 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" ];
};
}

0 comments on commit 8bf27e4

Please sign in to comment.