From 81d7539b3afb1ceb75fdc65508e3e4ef20a1c5b1 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Sat, 1 Feb 2025 07:52:30 -0500
Subject: nixos/nix: use systemd-tmpfiles for inputs in $NIX_PATH

---
 modules/shared/defaults/nix.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'modules/shared/defaults')

diff --git a/modules/shared/defaults/nix.nix b/modules/shared/defaults/nix.nix
index eb678a4..8ecdfe1 100644
--- a/modules/shared/defaults/nix.nix
+++ b/modules/shared/defaults/nix.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  inputs,
   ...
 }:
 let
@@ -13,6 +14,10 @@ let
     || lib.versionAtLeast config.nix.package.version "2.90.0"; # but not in lix yet
 
   hasAlwaysAllowSubstitutes = lib.versionAtLeast config.nix.package.version "2.19.0";
+
+  # Use systemd-tmpfiles on Linux
+  nixPathFromInput =
+    name: input: "${name}=${if isLinux then "/etc/nix/inputs/${name}" else input.outPath}";
 in
 {
   config = lib.mkMerge [
@@ -33,7 +38,7 @@ in
         };
 
         # See comment below
-        nixPath = [ "nixpkgs=${config.nixpkgs.flake.source}" ];
+        nixPath = lib.mapAttrsToList nixPathFromInput inputs;
       };
 
       nixpkgs = {
-- 
cgit v1.2.3