From 8b2577c7d5ad9ba71782110ea7e72e757825f16e Mon Sep 17 00:00:00 2001 From: r-vdp Date: Sat, 2 Nov 2024 18:15:21 +0100 Subject: [PATCH] nixos/tools: Make the tools derivations overridable Make sure that when re-assigning an overridden derivation to system.build.*, the overridden derivation is also the one that ends up in environment.systemPackages. --- nixos/modules/installer/tools/tools.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 6e3e2eb475f3..4a934ce982ea 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -228,10 +228,10 @@ in in [ (mkToolModule { name = "nixos-build-vms"; }) (mkToolModule { name = "nixos-enter"; }) - (mkToolModule { name = "nixos-generate-config"; package = nixos-generate-config; }) - (mkToolModule { name = "nixos-install"; package = nixos-install; }) + (mkToolModule { name = "nixos-generate-config"; package = config.system.build.nixos-generate-config; }) + (mkToolModule { name = "nixos-install"; package = config.system.build.nixos-install; }) (mkToolModule { name = "nixos-option"; }) - (mkToolModule { name = "nixos-rebuild"; package = nixos-rebuild; }) + (mkToolModule { name = "nixos-rebuild"; package = config.system.build.nixos-rebuild; }) (mkToolModule { name = "nixos-version"; package = nixos-version; }) ];