From 5a0008e2d920461bcc7c637320f68a3f0b89b2e4 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Tue, 18 Mar 2025 18:49:10 +0100 Subject: [PATCH] nixos/nix: wrap nix once --- nix-os/nix.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/nix-os/nix.nix b/nix-os/nix.nix index 5d17faa..de9687f 100644 --- a/nix-os/nix.nix +++ b/nix-os/nix.nix @@ -23,6 +23,9 @@ let --add-flags "--log-format" \ --add-flags "bar" ''; + passthru = { + inherit (pkgs.nix) man meta version; + }; }; wrappedNixosExecutables = pkgs.symlinkJoin { @@ -37,18 +40,9 @@ let --add-flags "bar" ''; }; - - - wrappedNix = (pkgs.symlinkJoin { - name = "wrappedNix-${pkgs.nix.version}"; - paths = [ pkgs.nix ] ++ [( wrappedNixExecutables false )]; - }).overrideAttrs { - version = pkgs.nix.version; - passthru.meta = pkgs.nix.meta; - }; in { config = { - nix.package = wrappedNix; + nix.package = wrappedNixExecutables false; environment.systemPackages = lib.map (lib.hiPrio) [ (wrappedNixExecutables true) wrappedNixosExecutables