nixos/nix: properly use makeWrapper hook
This commit is contained in:
parent
762e4cf52a
commit
37801ab26f
1 changed files with 6 additions and 3 deletions
|
@ -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"
|
||||
|
|
Loading…
Add table
Reference in a new issue