nixos/nix: wrap nix once

This commit is contained in:
Wroclaw 2025-03-18 18:49:10 +01:00
parent a3f4302bfb
commit 5a0008e2d9

View file

@ -23,6 +23,9 @@ let
--add-flags "--log-format" \ --add-flags "--log-format" \
--add-flags "bar" --add-flags "bar"
''; '';
passthru = {
inherit (pkgs.nix) man meta version;
};
}; };
wrappedNixosExecutables = pkgs.symlinkJoin { wrappedNixosExecutables = pkgs.symlinkJoin {
@ -37,18 +40,9 @@ let
--add-flags "bar" --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 { in {
config = { config = {
nix.package = wrappedNix; nix.package = wrappedNixExecutables false;
environment.systemPackages = lib.map (lib.hiPrio) [ environment.systemPackages = lib.map (lib.hiPrio) [
(wrappedNixExecutables true) (wrappedNixExecutables true)
wrappedNixosExecutables wrappedNixosExecutables