Bluesky app fork with some witchin' additions 💫
witchsky.app
bluesky
fork
client
Fix flake devshell wrt. Android SDK
social-app upstream seems to have bumped its SDK
Additionally, environment variable handling has been improved to avoid
impurities in the flake.
Verified by doing:
```sh
export NODE_ENV=production
yarn prebuild -p android && (cd ./android && ./gradlew assembleRelease)
```
authored by
Vika
and committed by
tangled.org
f28351e6
d081c3aa
+14
-16
+14
-16
flake.nix
+14
-16
flake.nix
···
16
16
flake-utils.lib.eachDefaultSystem (
17
17
system: let
18
18
noEmulator = (builtins.getEnv "NO_EMULATOR") == "1";
19
-
xdgStateHome = builtins.getEnv "XDG_STATE_HOME";
20
19
21
20
android-arch =
22
21
if system == "aarch64-darwin"
···
26
25
if system == "aarch64-darwin"
27
26
then "arm64-v8a"
28
27
else "x86_64";
29
-
homedir = builtins.getEnv "HOME";
30
-
state-home =
31
-
if pkgs.lib.last (pkgs.lib.splitString "-" system) == "darwin"
32
-
then "${homedir}/." # ~/.android
33
-
else "${xdgStateHome}/";
34
28
35
29
pkgs = import nixpkgs {
36
30
inherit system;
···
47
41
build-tools-35-0-0
48
42
cmdline-tools-latest
49
43
platform-tools
50
-
platforms-android-35
51
-
sources-android-35
44
+
platforms-android-36
45
+
sources-android-36
52
46
ndk-27-1-12297006
53
47
cmake-3-22-1
54
48
]
55
49
++ pkgs.lib.optionals (!noEmulator) [
56
50
emulator
57
-
sdk."system-images-android-35-google-apis-${android-arch}"
58
-
sdk."system-images-android-35-google-apis-playstore-${android-arch}"
51
+
sdk."system-images-android-36-google-apis-${android-arch}"
52
+
sdk."system-images-android-36-google-apis-playstore-${android-arch}"
59
53
]
60
54
);
61
55
62
56
create-avd = pkgs.writeShellScriptBin "create-avd" ''
63
57
avdmanager create avd \
64
-
--name android-35 \
65
-
--package 'system-images;android-35;google_apis_playstore;${android-arch-underline}' \
58
+
--name android-36 \
59
+
--package 'system-images;android-36;google_apis_playstore;${android-arch-underline}' \
66
60
--tag google_apis_playstore \
67
61
--device pixel_8 \
68
62
--force
···
82
76
JAVA_HOME = pinnedJDK;
83
77
ANDROID_HOME = "${androidSdk}/share/android-sdk";
84
78
ANDROID_SDK_ROOT = "${androidSdk}/share/android-sdk";
85
-
ANDROID_USER_HOME = "${state-home}android"; # has leading '/' sorted out already
86
-
ANDROID_AVD_HOME = "${ANDROID_USER_HOME}/avd";
87
79
88
-
GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/35.0.0/aapt2";
89
80
90
81
packages =
91
82
[
···
112
103
113
104
shellHook = ''
114
105
export GRADLE_USER_HOME=~/.cache/gradle
106
+
if [[ ${system} =~ .*-darwin ]]; then
107
+
export ANDROID_USER_HOME="~/.android"
108
+
else
109
+
export ANDROID_USER_HOME="''${XDG_STATE_HOME:-$HOME/.local/state}/android"
110
+
fi
111
+
export ANDROID_AVD_HOME="$ANDROID_USER_HOME/avd"
112
+
export GRADLE_OPTS="-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/35.0.0/aapt2''${GRADLE_OPTS:+ $GRADLE_OPTS}";
115
113
'';
116
114
};
117
115
};
118
116
}
119
117
);
120
-
}
118
+
}