From 37801ab26fd4c68781d493b88371a86d7818c221 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sat, 22 Feb 2025 12:07:57 +0100 Subject: [PATCH] nixos/nix: properly use makeWrapper hook --- nix-os/nix.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nix-os/nix.nix b/nix-os/nix.nix index 9a7b7c4..a3c00db 100644 --- a/nix-os/nix.nix +++ b/nix-os/nix.nix @@ -5,13 +5,14 @@ }: let - makeWrapper = "${pkgs.makeWrapper}/nix-support/setup-hook"; # bool -> nixpkgs[] wrappedNixExecutables = inEnvironment: assert builtins.isBool inEnvironment; pkgs.symlinkJoin { name = "${pkgs.nix.name}-wrap"; paths = [ pkgs.nix ]; + nativeBuildInputs = [ + pkgs.makeWrapper + ]; postBuild = '' - . ${makeWrapper} wrapProgram $out/bin/nix-build \ --add-flags "--log-format" \ --add-flags "bar${lib.optionalString inEnvironment "-with-logs"}" @@ -24,8 +25,10 @@ let wrappedNixosExecutables = pkgs.symlinkJoin { name = "${pkgs.nixos-rebuild.name}-wrap"; paths = [ pkgs.nixos-rebuild ]; + nativeBuildInputs = [ + pkgs.makeWrapper + ]; postBuild = '' - . ${makeWrapper} wrapProgram $out/bin/nixos-rebuild \ --add-flags "--log-format" \ --add-flags "bar"