sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Also fix the source filtering logic to work properly.
pull/2329/head
FliegendeWurst 2025-06-15 23:32:02 +07: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
Unescape Escape View File

@ -21,7 +21,7 @@
system:
let
pkgs = import nixpkgs { inherit system; };
electron = pkgs.electron_35;
electron = pkgs."electron_${lib.versions.major packageJsonDesktop.devDependencies.electron}";
nodejs = pkgs.nodejs_22;
pnpm = pkgs.pnpm_10;
inherit (pkgs)
@ -40,13 +40,13 @@
fullCleanSourceFilter =
name: type:
(lib.cleanSourceFilter name type)
|| (
&& (
let
baseName = baseNameOf (toString name);
in
# No need to copy the flake.
# 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 =
src:
@ -55,6 +55,7 @@
src = src;
};
packageJson = builtins.fromJSON (builtins.readFile ./package.json);
packageJsonDesktop = builtins.fromJSON (builtins.readFile ./apps/desktop/package.json);
makeApp =
{