Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-27 10:02:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(flake): use same Electron version as normal build

Browse Source 
Also fix the source filtering logic to work properly.
This commit is contained in:
FliegendeWurst 2025-06-15 23:32:02 +02:00
parent b9ae226569
commit 8cdb1859e3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
flake.nix
View File

@ -21,7 +21,7 @@
system: system:
let let
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
electron = pkgs.electron_35; electron = pkgs."electron_${lib.versions.major packageJsonDesktop.devDependencies.electron}";
nodejs = pkgs.nodejs_22; nodejs = pkgs.nodejs_22;
pnpm = pkgs.pnpm_10; pnpm = pkgs.pnpm_10;
inherit (pkgs) inherit (pkgs)
@ -40,13 +40,13 @@
fullCleanSourceFilter = fullCleanSourceFilter =
name: type: name: type:
(lib.cleanSourceFilter name type) (lib.cleanSourceFilter name type)
|| ( && (
let let
baseName = baseNameOf (toString name); baseName = baseNameOf (toString name);
in in
# No need to copy the flake. # No need to copy the flake.
# Don't copy local development instance of NX cache. # Don't copy local development instance of NX cache.
baseName == "flake.nix" || baseName == "flake.lock" || baseName == ".nx" baseName != "flake.nix" && baseName != "flake.lock" && baseName != ".nx"
); );
fullCleanSource = fullCleanSource =
src: src:
@ -55,6 +55,7 @@
src = src; src = src;
}; };
packageJson = builtins.fromJSON (builtins.readFile ./package.json); packageJson = builtins.fromJSON (builtins.readFile ./package.json);
packageJsonDesktop = builtins.fromJSON (builtins.readFile ./apps/desktop/package.json);
makeApp = makeApp =
{ {