From 27dd0973944f715cc1de415b334ca3e451bcd7b4 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 31 May 2025 17:41:56 +0300 Subject: [PATCH 01/13] chore(flake): start off with empty project --- flake.lock | 27 +++++++++++++++++++++++++++ flake.nix | 15 +++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 000000000..1271848a1 --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 000000000..c7a9a1c8f --- /dev/null +++ b/flake.nix @@ -0,0 +1,15 @@ +{ + description = "A very basic flake"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + }; + + outputs = { self, nixpkgs }: { + + packages.x86_64-linux.hello = nixpkgs.legacyPackages.x86_64-linux.hello; + + packages.x86_64-linux.default = self.packages.x86_64-linux.hello; + + }; +} From 5cd087f6608625d3e34c157c4c532431a8f0fabc Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 31 May 2025 18:08:06 +0300 Subject: [PATCH 02/13] chore(flake): get dependencies to install --- flake.lock | 34 ++++++++++++++++++++++++++++++++++ flake.nix | 33 +++++++++++++++++++++++++++++---- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 1271848a1..6d514a74f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1748460289, @@ -18,8 +36,24 @@ }, "root": { "inputs": { + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c7a9a1c8f..49d49f771 100644 --- a/flake.nix +++ b/flake.nix @@ -3,13 +3,38 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs }: { + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { inherit system; }; + build = pkgs.stdenv.mkDerivation (finalAttrs: { + pname = "triliumnext-desktop"; + version = "0.94.0"; + src = pkgs.lib.cleanSource ./.; - packages.x86_64-linux.hello = nixpkgs.legacyPackages.x86_64-linux.hello; + nativeBuildInputs = [ + pkgs.pnpm.configHook + pkgs.nodejs + ]; - packages.x86_64-linux.default = self.packages.x86_64-linux.hello; + buildPhase = '' + pnpm nx run desktop:build + ''; - }; + installPhase = '' + mkdir -p $out + ''; + + pnpmDeps = pkgs.pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-xC0u1h92wtthylOAw+IF9mpFi0c4xajJhUcA9pqzcAw="; + }; + }); + in { + packages.default = build; + } + ); } From bbe3bd710784643d268d2d006e7266d2efbce6cf Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 31 May 2025 18:09:45 +0300 Subject: [PATCH 03/13] chore(flake): ignore /result from repo --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index cf2fa89dd..ecb8c9edf 100644 --- a/.gitignore +++ b/.gitignore @@ -43,4 +43,6 @@ apps/*/out upload .rollup.cache -*.tsbuildinfo \ No newline at end of file +*.tsbuildinfo + +/result \ No newline at end of file From e82567a33def158b26ba58a79f773d59b9ac089b Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 31 May 2025 18:15:22 +0300 Subject: [PATCH 04/13] chore(flake): get the build to run --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 49d49f771..540577e91 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ ]; buildPhase = '' - pnpm nx run desktop:build + NX_TUI=false NX_DAEMON=false pnpm nx run desktop:build ''; installPhase = '' From c365cdb6c6982451f131c3435a170437139dc680 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 31 May 2025 18:21:08 +0300 Subject: [PATCH 05/13] chore(flake): patch dart --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 540577e91..aabdba6af 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,7 @@ ]; buildPhase = '' + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) node_modules/.pnpm/sass-embedded-linux-x64@1.87.0/node_modules/sass-embedded-linux-x64/dart-sass/src/dart NX_TUI=false NX_DAEMON=false pnpm nx run desktop:build ''; From e2737d2d551eefd36548c7eaa2c90230d472f4d8 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 31 May 2025 18:23:18 +0300 Subject: [PATCH 06/13] chore(flake): get build to succeed --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index aabdba6af..7f6a11a94 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ buildPhase = '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) node_modules/.pnpm/sass-embedded-linux-x64@1.87.0/node_modules/sass-embedded-linux-x64/dart-sass/src/dart - NX_TUI=false NX_DAEMON=false pnpm nx run desktop:build + NX_TUI=false NX_DAEMON=false pnpm nx run desktop:build --outputStyle stream ''; installPhase = '' From 93a9911727bf91b9190d882877dc198b16475189 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 31 May 2025 18:32:23 +0300 Subject: [PATCH 07/13] chore(flake): actually copy the dist --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 7f6a11a94..38d56f366 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,7 @@ installPhase = '' mkdir -p $out + cp -r apps/desktop/dist $out ''; pnpmDeps = pkgs.pnpm.fetchDeps { From 7b577e31c43d90470ca7fdd30b3e638ff6822591 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 31 May 2025 19:16:23 +0300 Subject: [PATCH 08/13] chore(flake): build native dependencies --- flake.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 38d56f366..8da78d399 100644 --- a/flake.nix +++ b/flake.nix @@ -10,19 +10,22 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; + electron = pkgs.electron_35; build = pkgs.stdenv.mkDerivation (finalAttrs: { pname = "triliumnext-desktop"; version = "0.94.0"; src = pkgs.lib.cleanSource ./.; - nativeBuildInputs = [ - pkgs.pnpm.configHook - pkgs.nodejs + nativeBuildInputs = with pkgs; [ + pnpm.configHook + nodejs + nodejs.python ]; buildPhase = '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) node_modules/.pnpm/sass-embedded-linux-x64@1.87.0/node_modules/sass-embedded-linux-x64/dart-sass/src/dart - NX_TUI=false NX_DAEMON=false pnpm nx run desktop:build --outputStyle stream + NX_TUI=false NX_DAEMON=false pnpm nx run desktop:build --outputStyle stream --verbose + NX_TUI=false NX_DAEMON=false npm_config_nodedir=${electron.headers} pnpm nx run desktop:rebuild-deps --outputStyle stream --verbose ''; installPhase = '' From fc4ec9a0457787c34895256f1782fcf30e41ce9b Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 31 May 2025 19:24:43 +0300 Subject: [PATCH 09/13] refactor(flake): deduplicate environment variables --- flake.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 8da78d399..b89040c95 100644 --- a/flake.nix +++ b/flake.nix @@ -23,9 +23,16 @@ ]; buildPhase = '' + # Disable NX interaction + export NX_TUI=false + export NX_DAEMON=false + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) node_modules/.pnpm/sass-embedded-linux-x64@1.87.0/node_modules/sass-embedded-linux-x64/dart-sass/src/dart - NX_TUI=false NX_DAEMON=false pnpm nx run desktop:build --outputStyle stream --verbose - NX_TUI=false NX_DAEMON=false npm_config_nodedir=${electron.headers} pnpm nx run desktop:rebuild-deps --outputStyle stream --verbose + pnpm nx run desktop:build --outputStyle stream --verbose + + # Rebuild dependencies + export npm_config_nodedir=${electron.headers} + pnpm nx run desktop:rebuild-deps --outputStyle stream --verbose ''; installPhase = '' From d506283e48db2f9bf9bd33dd96de2dff9aa08f66 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sat, 31 May 2025 18:53:07 +0200 Subject: [PATCH 10/13] feat(flake): desktop item, wrapped binary --- flake.lock | 8 +++--- flake.nix | 76 ++++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 67 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 6d514a74f..07c8f8b86 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1748437600, + "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", "owner": "nixos", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index b89040c95..8983c4bea 100644 --- a/flake.nix +++ b/flake.nix @@ -1,28 +1,50 @@ { - description = "A very basic flake"; + description = "TriliumNext Notes (experimental flake)"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem (system: + outputs = + { + self, + nixpkgs, + flake-utils, + }: + flake-utils.lib.eachDefaultSystem ( + system: let + packageJSON = builtins.fromJSON (builtins.readFile ./package.json); pkgs = import nixpkgs { inherit system; }; electron = pkgs.electron_35; - build = pkgs.stdenv.mkDerivation (finalAttrs: { + inherit (pkgs) + copyDesktopItems + lib + makeBinaryWrapper + makeDesktopItem + nodejs + pnpm + stdenv + wrapGAppsHook3 + ; + desktop = stdenv.mkDerivation (finalAttrs: { pname = "triliumnext-desktop"; - version = "0.94.0"; - src = pkgs.lib.cleanSource ./.; + version = packageJSON.version; + src = lib.cleanSource ./.; - nativeBuildInputs = with pkgs; [ + nativeBuildInputs = [ pnpm.configHook nodejs nodejs.python + copyDesktopItems + makeBinaryWrapper + wrapGAppsHook3 ]; buildPhase = '' + runHook preBuild + # Disable NX interaction export NX_TUI=false export NX_DAEMON=false @@ -33,20 +55,48 @@ # Rebuild dependencies export npm_config_nodedir=${electron.headers} pnpm nx run desktop:rebuild-deps --outputStyle stream --verbose + + runHook postBuild ''; installPhase = '' - mkdir -p $out - cp -r apps/desktop/dist $out + runHook preInstall + + mkdir -p $out/{bin,opt/trilium} + cp --archive apps/desktop/dist/* $out/opt/trilium + makeWrapper ${lib.getExe electron} $out/bin/trilium \ + "''${gappsWrapperArgs[@]}" \ + --set-default ELECTRON_IS_DEV 0 \ + --add-flags $out/opt/trilium/main.cjs + + runHook postInstall ''; - pnpmDeps = pkgs.pnpm.fetchDeps { + desktopItems = [ + (makeDesktopItem { + name = "TriliumNext Notes"; + exec = finalAttrs.meta.mainProgram; + icon = "trilium"; + comment = finalAttrs.meta.description; + desktopName = "TriliumNext Notes"; + categories = [ "Office" ]; + startupWMClass = "Trilium Notes Next"; + }) + ]; + + pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-xC0u1h92wtthylOAw+IF9mpFi0c4xajJhUcA9pqzcAw="; }; + + meta = { + description = "Free and open-source, cross-platform hierarchical note taking application with focus on building large personal knowledge bases"; + mainProgram = "trilium"; + }; }); - in { - packages.default = build; + in + { + packages.default = desktop; } ); } From 89e2d46088e8db24ae3e115ba4783229963095f0 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sat, 31 May 2025 19:12:52 +0200 Subject: [PATCH 11/13] fix(flake): handle sass updates better --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 8983c4bea..8f3b17a53 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,8 @@ export NX_TUI=false export NX_DAEMON=false - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) node_modules/.pnpm/sass-embedded-linux-x64@1.87.0/node_modules/sass-embedded-linux-x64/dart-sass/src/dart + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + node_modules/.pnpm/sass-embedded-linux-x64@*/node_modules/sass-embedded-linux-x64/dart-sass/src/dart pnpm nx run desktop:build --outputStyle stream --verbose # Rebuild dependencies From 628c52eb045a6e9570d8d3cc31f47b3594297271 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sat, 31 May 2025 19:12:52 +0200 Subject: [PATCH 12/13] fix(flake): don't double wrap output --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index 8f3b17a53..4d89c8d0f 100644 --- a/flake.nix +++ b/flake.nix @@ -42,6 +42,8 @@ wrapGAppsHook3 ]; + dontWrapGApps = true; + buildPhase = '' runHook preBuild From 381498433fd8077d3a9903e348fe6131c2423989 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sat, 31 May 2025 19:15:46 +0200 Subject: [PATCH 13/13] fix(flake): copy app icon --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 4d89c8d0f..a2dd0197b 100644 --- a/flake.nix +++ b/flake.nix @@ -65,8 +65,9 @@ installPhase = '' runHook preInstall - mkdir -p $out/{bin,opt/trilium} + mkdir -p $out/{bin,share/icons/hicolor/512x512/apps,opt/trilium} cp --archive apps/desktop/dist/* $out/opt/trilium + cp apps/client/src/assets/icon.png $out/share/icons/hicolor/512x512/apps/trilium.png makeWrapper ${lib.getExe electron} $out/bin/trilium \ "''${gappsWrapperArgs[@]}" \ --set-default ELECTRON_IS_DEV 0 \