From 5cd087f6608625d3e34c157c4c532431a8f0fabc Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 31 May 2025 18:08:06 +0300 Subject: [PATCH] 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; + } + ); }