From 2548a8f0dd4b9b2e604bb309eccd4c2a547cf309 Mon Sep 17 00:00:00 2001 From: Tasia Iso Date: Thu, 30 May 2024 19:23:39 +0200 Subject: [PATCH] trustedusers --- common/base.nix | 1 + modules/nixos/vedirect-reader.nix | 2 +- pkgs/vedirect-reader/default.nix | 29 ++++++++++++++++++++++------- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/common/base.nix b/common/base.nix index 495712d..425b925 100644 --- a/common/base.nix +++ b/common/base.nix @@ -30,6 +30,7 @@ auto-optimise-store = true; warn-dirty = false; + trustedUsers = [ "@wheel" ]; }; # This will add each flake input as a registry diff --git a/modules/nixos/vedirect-reader.nix b/modules/nixos/vedirect-reader.nix index c2c740b..63dded0 100644 --- a/modules/nixos/vedirect-reader.nix +++ b/modules/nixos/vedirect-reader.nix @@ -24,7 +24,7 @@ in { config = mkIf cfg.enable { systemd.services.vedirect-reader = { wantedBy = ["multi-user.target"]; - serviceConfig.ExecStart = "node ${pkgs.vedirect-reader}/lib/node_modules/vedirect-reader/main.js"; + serviceConfig.ExecStart = "${pkgs.node}/bin/node ${pkgs.vedirect-reader}/lib/node_modules/vedirect-reader/main.js"; }; }; } diff --git a/pkgs/vedirect-reader/default.nix b/pkgs/vedirect-reader/default.nix index d18f086..9ab3567 100644 --- a/pkgs/vedirect-reader/default.nix +++ b/pkgs/vedirect-reader/default.nix @@ -1,13 +1,11 @@ -{ - lib, - buildNpmPackage, - fetchFromGitea, -}: -buildNpmPackage rec { +{ pkgs ? import {}, + lib ? import }: + +pkgs.buildNpmPackage rec { pname = "vedirect-reader"; version = "0.0.0"; - src = fetchFromGitea { + src = pkgs.fetchFromGitea { domain = "gitea.com"; owner = "tasiaiso"; repo = "vedirect-reader"; @@ -18,6 +16,23 @@ buildNpmPackage rec { npmDepsHash = "sha256-oUFinl22QvMZutAY+FwQiAQqrQevObbsLLCNzWnAVxA="; dontNpmBuild = true; + nativeBuildInputs = with pkgs; [ + # gnumake + # openssl + # which + nodejs + ]; + + # buildPhase = '' + # make -j $NIX_BUILD_CORES release + # ''; + + # installPhase = '' + # mkdir -p $out/bin + + # cp -r out/release/* $out/bin + # ''; + # doCheck = false; # meta = {