fix(flake): make flake build android/desktop/web

This commit is contained in:
lunar-seal committed 2026-08-13 17:00:45 +02:00
1 parent ca531ebabe
commit f21b9411b2
2 files changed
+172 -140

No files matched your search

Generated
+21 -43
View File
@@ -8,11 +8,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1784276287,
"narHash": "sha256-xXONk0mfpVtFSaZZp21bjw1eRud0dFJ2jpVQ/TQX7ZY=",
"lastModified": 1786606848,
"narHash": "sha256-RS78j/7iFHjIMzTr9bS3PypjvPozHBfdR5xBJ+ABXXA=",
"owner": "nix-community",
"repo": "fenix",
"rev": "3181005f932fbae4626c6a6dca5b728742656d9e",
"rev": "3df888be63045c349a6d322f0214f1346bb18be9",
"type": "github"
},
"original": {
@@ -42,11 +42,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1777988971,
"narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
"lastModified": 1785627969,
"narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
"rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
"type": "github"
},
"original": {
@@ -58,17 +58,16 @@
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat",
"gitignore": "gitignore",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1776796298,
"narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
"lastModified": 1784288435,
"narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
"rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9",
"type": "github"
},
"original": {
@@ -77,34 +76,13 @@
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1777954456,
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
"lastModified": 1786599213,
"narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
"rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4",
"type": "github"
},
"original": {
@@ -116,11 +94,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1777168982,
"narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
"lastModified": 1785031560,
"narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
"rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
"type": "github"
},
"original": {
@@ -141,11 +119,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1784247776,
"narHash": "sha256-GiZgiGRmDl773Y8wEnS1Vs/KJICXwYYspYSuKS0dhLc=",
"lastModified": 1786530578,
"narHash": "sha256-fCOcC64H7e0EIlIHTCsl5FQ9CW4S6VK3OLn1ugWR9zI=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "7d5fff4b1a86097dda2b8bb899eaf5cf6b6827d5",
"rev": "068bb508581477a5e3f753e1e206d34288dfa9c9",
"type": "github"
},
"original": {
@@ -162,11 +140,11 @@
]
},
"locked": {
"lastModified": 1775636079,
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
"lastModified": 1785945821,
"narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
"rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0",
"type": "github"
},
"original": {
+151 -97
View File
@@ -24,7 +24,6 @@
systems = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
@@ -46,6 +45,8 @@
};
};
### rust ###
rust = (
with inputs'.fenix.packages;
combine [
@@ -57,9 +58,10 @@
]
);
### android ###
platformVersion = "36";
systemImageType = "default";
currentPath = builtins.getEnv "PWD";
androidEnv = pkgs.androidenv.override { licenseAccepted = true; };
androidComp = (
androidEnv.composeAndroidPackages {
@@ -86,14 +88,18 @@
cmakeVersions = [ "3.10.2" ];
}
);
android-sdk = pkgs.android-studio.withSdk androidComp.androidsdk;
android-sdk = androidComp.androidsdk;
self = inputs.self;
### web ###
packageJson = builtins.fromJSON (builtins.readFile ./package.json);
nodejs = pkgs.nodejs_24;
pnpm = pkgs.pnpm_10;
# Keep in sync with package.json; currently 0.57.0.
oxfmt =
(builtins.getFlake "github:NixOS/nixpkgs/ede57125e7b774b47b6f98855a5c150a4b87b67f?narHash=sha256-wpyvzzT8H%2B8hQ3W4EyQraEbOXolQm91FqbF7OywX3fQ%3D")
.legacyPackages.${system}.oxfmt;
pnpmConfigHook = pkgs.pnpmConfigHook.override { inherit pnpm; };
pnpmNativeBuildInputs = [
@@ -151,69 +157,105 @@
doCheck = false;
});
nativeBuildInputs = with pkgs; [
pkg-config
gobject-introspection
cargo
cargo-tauri
nodejs
xdg-utils
desktop-file-utils
wrapGAppsHook3
];
### CEF ###
buildInputs = with pkgs; [
at-spi2-atk
atkmm
cairo
gdk-pixbuf
glib
glib-networking
gtk3
gsettings-desktop-schemas
harfbuzz
librsvg
libsoup_3
pango
webkitgtk_4_1
openssl
dbus
dbus.dev
libayatana-appindicator
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
gst_all_1.gst-libav
android-sdk
];
cef = pkgs.cef-binary.override {
version = "150.0.14";
gitRevision = "7c1aa68";
chromiumVersion = "150.0.7871.129";
srcHashes = {
x86_64-linux = "sha256-QO9hPkVcrNB6p8gfQl76qLb3frg/E8wo1HDuuk5h+Y8=";
};
};
defaultPackages = [
# fake archive json to prevent tauri from downloading cef again https://github.com/tauri-apps/cef-rs/issues/426
fakeArchiveJson = pkgs.writeText "archive.json" (
builtins.toJSON {
name = cef.src.name;
sha1 = "";
type = "minimal";
}
);
cefFlat = pkgs.symlinkJoin {
name = "cef-${cef.version}-flat";
paths = [
"${cef}/${cef.buildType}"
"${cef}/Resources"
];
postBuild = ''
ln -s ${cef}/libcef_dll "$out/"
ln -s ${fakeArchiveJson} "$out/archive.json"
'';
};
### shells ###
webPackages = [
nodejs
pnpm
rust
pkgs.cargo
pkgs.cargo-tauri
pkgs.corepack
pkgs.vitejs
pkgs.oxlint
pkgs.oxfmt
oxfmt
pkgs.knope
pkgs.typescript
pkgs.typescript-language-server
pkgs.nil
pkgs.nixd
pkgs.jdk
pkgs.mise
];
libayatana-appindicator = pkgs.libayatana-appindicator.overrideAttrs (old: {
postFixup = (old.postFixup or "") + ''
substituteInPlace "$dev/lib/pkgconfig/ayatana-appindicator3-0.1.pc" \
--replace-fail "Requires:" "Requires.private:"
'';
});
linuxDesktopBuildInputs = with pkgs; [
at-spi2-atk
atkmm
cairo
dbus
dbus.dev
gdk-pixbuf
glib
glib-networking
gsettings-desktop-schemas
gtk3
harfbuzz
libayatana-appindicator
librsvg
libsoup_3
openssl
pango
webkitgtk_4_1
];
linuxRuntimeLibs = with pkgs; [
libGL
libpulseaudio
libxkbcommon
pipewire
];
gstPlugins = with pkgs.gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-bad
gst-plugins-ugly
gst-libav
];
in
{
treefmt = {
projectRootFile = "flake.nix";
programs = {
nixfmt.enable = true;
oxfmt.enable = true;
oxfmt = {
enable = true;
package = oxfmt;
};
};
settings.global.excludes = [
"dist"
@@ -233,45 +275,46 @@
};
};
packages.sable = pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "sable";
inherit (packageJson) version;
src = lib.cleanSource ./.;
packages = {
sable = pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "sable";
inherit (packageJson) version;
src = lib.cleanSource ./.;
# ignoring knope for building
pnpmInstallFlags = [ "--ignore-scripts" ];
pnpmInstallFlags = [ "--ignore-scripts" ];
pnpmDeps = mkPnpmDeps {
inherit (finalAttrs) src version pnpmInstallFlags;
pnpmDeps = mkPnpmDeps {
inherit (finalAttrs) src version pnpmInstallFlags;
};
nativeBuildInputs = pnpmNativeBuildInputs;
env.VITE_BUILD_HASH = inputs.self.shortRev or inputs.self.dirtyShortRev or "";
env.SABLE_BUILD_FLAVOR = "stable";
buildPhase = ''
runHook preBuild
pnpm run build
runHook postBuild
'';
installPhase = ''
runHook preInstall
cp -r dist $out
runHook postInstall
'';
});
default = config.packages.sable;
android-emulator = androidEnv.emulateApp {
name = "emulate-sable";
platformVersion = platformVersion;
abiVersion = "x86_64"; # arm64-v8a
systemImageType = systemImageType;
};
nativeBuildInputs = pnpmNativeBuildInputs;
env.VITE_BUILD_HASH = self.shortRev or self.dirtyShortRev or "";
env.SABLE_BUILD_FLAVOR = "stable";
buildPhase = ''
runHook preBuild
pnpm run build
runHook postBuild
'';
installPhase = ''
runHook preInstall
cp -r dist $out
runHook postInstall
'';
});
packages.android-emulator = androidEnv.emulateApp {
name = "emulate-sable";
platformVersion = platformVersion;
abiVersion = "x86_64"; # arm64-v8a
systemImageType = systemImageType;
};
packages.default = config.packages.sable;
checks = {
build = config.packages.sable;
lint = mkPnpmCheck "lint" "lint";
@@ -283,34 +326,45 @@
devShells = {
default = pkgs.mkShell {
inherit buildInputs nativeBuildInputs;
packages = webPackages;
};
packages = defaultPackages;
desktop = pkgs.mkShell {
packages = webPackages ++ [
rust
pkgs.cargo-tauri
pkgs.desktop-file-utils
pkgs.pkg-config
pkgs.xdg-utils
];
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath (nativeBuildInputs ++ buildInputs);
buildInputs = linuxDesktopBuildInputs;
CEF_PATH = "${cefFlat}";
GIO_EXTRA_MODULES = "${pkgs.glib-networking}/lib/gio/modules";
GST_PLUGIN_SYSTEM_PATH = "${pkgs.gst_all_1.gst-plugins-base}/lib/gstreamer-1.0:${pkgs.gst_all_1.gst-plugins-good}/lib/gstreamer-1.0:${pkgs.gst_all_1.gst-plugins-bad}/lib/gstreamer-1.0";
GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gstPlugins;
LD_LIBRARY_PATH = lib.concatStringsSep ":" [
(lib.makeLibraryPath (linuxRuntimeLibs ++ linuxDesktopBuildInputs))
"${pkgs.addDriverRunpath.driverLink}/lib"
"${cefFlat}"
];
RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
};
android = pkgs.mkShell rec {
inherit buildInputs nativeBuildInputs;
packages = defaultPackages ++ [
packages = webPackages ++ [
rust
pkgs.cargo-tauri
pkgs.pkg-config
android-sdk
pkgs.jdk
];
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath (nativeBuildInputs ++ buildInputs);
ANDROID_HOME = "${androidComp.androidsdk}/libexec/android-sdk";
ANDROID_SDK_ROOT = "${androidComp.androidsdk}/libexec/android-sdk";
ANDROID_NDK_ROOT = "${androidComp.androidsdk}/libexec/android-sdk/ndk-bundle";
GIO_EXTRA_MODULES = "${pkgs.glib-networking}/lib/gio/modules";
GST_PLUGIN_SYSTEM_PATH = "${pkgs.gst_all_1.gst-plugins-base}/lib/gstreamer-1.0:${pkgs.gst_all_1.gst-plugins-good}/lib/gstreamer-1.0:${pkgs.gst_all_1.gst-plugins-bad}/lib/gstreamer-1.0";
GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/35.0.0/aapt2";
RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";