From e99d7affb0c128fa82722f9b3d79c99b5e5918cd Mon Sep 17 00:00:00 2001 From: Ophestra Date: Mon, 11 Aug 2025 02:52:32 +0900 Subject: container: use absolute for pathname This is simultaneously more efficient and less error-prone. This change caused minor API changes in multiple other packages. Signed-off-by: Ophestra --- nixos.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'nixos.nix') diff --git a/nixos.nix b/nixos.nix index d67d3487..a26b3658 100644 --- a/nixos.nix +++ b/nixos.nix @@ -124,6 +124,7 @@ in username = getsubname fid app.identity; data = getsubhome fid app.identity; + inherit (cfg) shell; inherit (app) identity groups; container = { @@ -177,23 +178,23 @@ in auto_etc = true; symlink = [ - [ - "*/run/current-system" - "/run/current-system" - ] + { + target = "/run/current-system"; + linkname = "*/run/current-system"; + } ] ++ optionals (isGraphical && config.hardware.graphics.enable) ( [ - [ - config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver"."L+".argument - "/run/opengl-driver" - ] + { + target = "/run/opengl-driver"; + linkname = config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver"."L+".argument; + } ] ++ optionals (app.multiarch && config.hardware.graphics.enable32Bit) [ - [ - config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver-32"."L+".argument - /run/opengl-driver-32 - ] + { + target = "/run/opengl-driver-32"; + linkname = config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver-32"."L+".argument; + } ] ); }; -- cgit v1.3.1