From 45d582c21905c1680642945cda1e7852ee2f0613 Mon Sep 17 00:00:00 2001 From: Nicolas Hiillos Date: Mon, 23 Oct 2023 14:52:40 +0300 Subject: [PATCH] Update nosetuid --- modules/linuxcnc.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/linuxcnc.nix b/modules/linuxcnc.nix index 0454429..cdf1a9f 100644 --- a/modules/linuxcnc.nix +++ b/modules/linuxcnc.nix @@ -1,12 +1,12 @@ { config, lib, pkgs, ... }: let - cfg = config.local.packages.linuxcnc; + cfg = config.local.packages.linuxcnc-with-ethercat; inherit (builtins) filter map pathExists listToAttrs; in { options.local.packages.linuxcnc.enable = lib.mkEnableOption "Enable linuxcnc"; config = lib.mkIf cfg.enable { - environment.systemPackages = with pkgs; [ linuxcnc ]; + environment.systemPackages = with pkgs; [ linuxcnc-with-ethercat ]; security.wrappers = listToAttrs (map (f: { name = f; @@ -14,8 +14,8 @@ in { setuid = true; owner = "root"; group = "root"; - source = "${pkgs.linuxcnc}/bin/${f}-nosetuid"; + source = "${pkgs.linuxcnc-with-ethercat}/bin/${f}-nosetuid"; }; - }) (filter (f: pathExists "${pkgs.linuxcnc}/bin/${f}-nosetuid") pkgs.linuxcnc.setuidApps)); + }) (filter (f: pathExists "${pkgs.linuxcnc-with-ethercat}/bin/${f}-nosetuid") pkgs.linuxcnc-with-ethercat.setuidApps)); }; }