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
|
let
|
||||||
makeWrapper = "${pkgs.makeWrapper}/nix-support/setup-hook";
|
|
||||||
# bool -> nixpkgs[]
|
# bool -> nixpkgs[]
|
||||||
wrappedNixExecutables = inEnvironment: assert builtins.isBool inEnvironment; pkgs.symlinkJoin {
|
wrappedNixExecutables = inEnvironment: assert builtins.isBool inEnvironment; pkgs.symlinkJoin {
|
||||||
name = "${pkgs.nix.name}-wrap";
|
name = "${pkgs.nix.name}-wrap";
|
||||||
paths = [ pkgs.nix ];
|
paths = [ pkgs.nix ];
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pkgs.makeWrapper
|
||||||
|
];
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
. ${makeWrapper}
|
|
||||||
wrapProgram $out/bin/nix-build \
|
wrapProgram $out/bin/nix-build \
|
||||||
--add-flags "--log-format" \
|
--add-flags "--log-format" \
|
||||||
--add-flags "bar${lib.optionalString inEnvironment "-with-logs"}"
|
--add-flags "bar${lib.optionalString inEnvironment "-with-logs"}"
|
||||||
|
@ -24,8 +25,10 @@ let
|
||||||
wrappedNixosExecutables = pkgs.symlinkJoin {
|
wrappedNixosExecutables = pkgs.symlinkJoin {
|
||||||
name = "${pkgs.nixos-rebuild.name}-wrap";
|
name = "${pkgs.nixos-rebuild.name}-wrap";
|
||||||
paths = [ pkgs.nixos-rebuild ];
|
paths = [ pkgs.nixos-rebuild ];
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pkgs.makeWrapper
|
||||||
|
];
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
. ${makeWrapper}
|
|
||||||
wrapProgram $out/bin/nixos-rebuild \
|
wrapProgram $out/bin/nixos-rebuild \
|
||||||
--add-flags "--log-format" \
|
--add-flags "--log-format" \
|
||||||
--add-flags "bar"
|
--add-flags "bar"
|
||||||
|
|
Loading…
Add table
Reference in a new issue