mirror of
https://github.com/Julow/Unexpected-Keyboard.git
synced 2024-11-21 14:53:11 +01:00
b21bf3fffd
* shell.nix: fix gradle error
error was:
> \> Task :compileDebugJavaWithJavac FAILED
> error: Source option 7 is no longer supported. Use 8 or later.
> error: Target option 7 is no longer supported. Use 8 or later.
fixed by overriding the jdk version for gradle to openjdk17
* layouts/latn_bone: fix layout
- fix alignment with tabs mess
- make like actual bone layout, instead of trying to fit it into a 10 key
wide keyboard
- fixes missing üäö
- fix missing $
- moves q and ß where they belong
- remove all of the diacritic keys (they can be added through the
settings as extra keys)
- kept the number row extra keys integration into top row
- kept the idea of compressing , and . into the swipe actions of the
bottom row
- kept the number keys as key4 in the layer4 positions (instead of
moving them to a number row, which i also considered)
35 lines
1.0 KiB
Nix
35 lines
1.0 KiB
Nix
{ pkgs ? import <nixpkgs> {
|
|
config.android_sdk.accept_license = true;
|
|
config.allowUnfree = true;
|
|
} }:
|
|
|
|
let
|
|
jdk = pkgs.openjdk17;
|
|
build_tools_version = "33.0.1";
|
|
|
|
android = pkgs.androidenv.composeAndroidPackages {
|
|
buildToolsVersions = [ build_tools_version ];
|
|
platformVersions = [ "34" ];
|
|
abiVersions = [ "armeabi-v7a" ];
|
|
};
|
|
|
|
ANDROID_SDK_ROOT = "${android.androidsdk}/libexec/android-sdk";
|
|
|
|
gradle = pkgs.gradle.override { java = jdk; };
|
|
# Without this option, aapt2 fails to run with a permissions error.
|
|
gradle_wrapped = pkgs.runCommandLocal "gradle-wrapped" {
|
|
nativeBuildInputs = with pkgs; [ makeBinaryWrapper ];
|
|
} ''
|
|
mkdir -p $out/bin
|
|
ln -s ${gradle}/bin/gradle $out/bin/gradle
|
|
wrapProgram $out/bin/gradle \
|
|
--add-flags "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${build_tools_version}/aapt2"
|
|
'';
|
|
|
|
in pkgs.mkShell {
|
|
buildInputs =
|
|
[ pkgs.findutils pkgs.fontforge jdk android.androidsdk gradle_wrapped ];
|
|
JAVA_HOME = jdk.home;
|
|
inherit ANDROID_SDK_ROOT;
|
|
}
|