use devshell for macos
This commit is contained in:
parent
9298eb815d
commit
b2813a0eb5
2 changed files with 7 additions and 5 deletions
6
.github/workflows/macos.yml
vendored
6
.github/workflows/macos.yml
vendored
|
|
@ -20,10 +20,10 @@ jobs:
|
||||||
extra_nix_config: experimental-features = nix-command flakes flake-self-attrs
|
extra_nix_config: experimental-features = nix-command flakes flake-self-attrs
|
||||||
|
|
||||||
- name: Build app
|
- name: Build app
|
||||||
run: nix build .#default
|
run: nix develop --command bash -c "flutter pub get && dart scripts/generate.dart && flutter pub run build_runner build && flutter build macos --release"
|
||||||
|
|
||||||
- name: Upload installer artifact
|
- name: Upload installer artifact
|
||||||
uses: actions/upload-artifact@v6
|
uses: actions/upload-artifact@v6
|
||||||
with:
|
with:
|
||||||
name: flatpak-${{ matrix.arch }}
|
name: App
|
||||||
path: result/Nexus.app
|
path: build/macos/Build/Products/Release/Nexus.app
|
||||||
|
|
@ -35,8 +35,6 @@ pkgs.mkShell {
|
||||||
|
|
||||||
env = rec {
|
env = rec {
|
||||||
LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.libclang ];
|
LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.libclang ];
|
||||||
LD_LIBRARY_PATH = "./build/native_assets/linux:${lib.makeLibraryPath [ pkgs.zlib ]}";
|
|
||||||
CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ];
|
|
||||||
|
|
||||||
ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
|
ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
|
||||||
ANDROID_SDK_ROOT = ANDROID_HOME;
|
ANDROID_SDK_ROOT = ANDROID_HOME;
|
||||||
|
|
@ -44,5 +42,9 @@ pkgs.mkShell {
|
||||||
|
|
||||||
TOOLS = "${ANDROID_HOME}/build-tools/${"36.0.0"}";
|
TOOLS = "${ANDROID_HOME}/build-tools/${"36.0.0"}";
|
||||||
GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${TOOLS}/aapt2";
|
GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${TOOLS}/aapt2";
|
||||||
|
}
|
||||||
|
// lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||||
|
CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ];
|
||||||
|
LD_LIBRARY_PATH = "./build/native_assets/linux:${lib.makeLibraryPath [ pkgs.zlib ]}";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue