Skip to content

Commit 15004f0

Browse files
authored
keyboard-layout-editor: fix dependencies for all platforms (NixOS#366098)
2 parents b14b5cd + 641e2ec commit 15004f0

File tree

2 files changed

+51
-3
lines changed

2 files changed

+51
-3
lines changed

pkgs/by-name/ke/keyboard-layout-editor/deps.json

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkgs/by-name/ke/keyboard-layout-editor/package.nix

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,15 @@ stdenv.mkDerivation rec {
3434
wrapGAppsHook3
3535
];
3636

37+
gradleUpdateScript = ''
38+
runHook preBuild
39+
40+
gradle nixDownloadDeps -Dos.family=linux -Dos.arch=amd64
41+
gradle nixDownloadDeps -Dos.family=linux -Dos.arch=aarch64
42+
gradle nixDownloadDeps -Dos.name='mac os x' -Dos.arch=amd64
43+
gradle nixDownloadDeps -Dos.name='mac os x' -Dos.arch=aarch64
44+
'';
45+
3746
mitmCache = gradle_8.fetchDeps {
3847
inherit pname;
3948
data = ./deps.json;
@@ -66,8 +75,11 @@ stdenv.mkDerivation rec {
6675
license = lib.licenses.mit;
6776
maintainers = with lib.maintainers; [ fliegendewurst ];
6877
mainProgram = "keyboard-layout-editor";
69-
platforms = jdk.meta.platforms;
70-
# gradle resolves platform-specific dependencies
71-
broken = stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isDarwin;
78+
platforms = [
79+
"x86_64-linux"
80+
"aarch64-linux"
81+
"x86_64-darwin"
82+
"aarch64-darwin"
83+
];
7284
};
7385
}

0 commit comments

Comments
 (0)