nixos/nix: remove use of mkWrappedExecutable and buildEnv
This commit is contained in:
parent
5c01a58f54
commit
b5e40f0d64
1 changed files with 29 additions and 11 deletions
|
@ -5,19 +5,37 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (pkgs) mkWrappedExecutable;
|
makeWrapper = "${pkgs.makeWrapper}/nix-support/setup-hook";
|
||||||
|
|
||||||
# bool -> nixpkgs[]
|
# bool -> nixpkgs[]
|
||||||
wrappedNixExecutables = inEnvironment: assert builtins.isBool inEnvironment; [
|
wrappedNixExecutables = inEnvironment: assert builtins.isBool inEnvironment; pkgs.symlinkJoin {
|
||||||
(mkWrappedExecutable {pkg = pkgs.nix; exe = "nix-build"; wrapperArgs = ["--add-flags" "\"--log-format\"" "--add-flags" "bar${lib.optionalString inEnvironment "-with-logs"}"];})
|
name = "${pkgs.nix.name}-wrap";
|
||||||
(mkWrappedExecutable {pkg = pkgs.nix; exe = "nix-shell"; wrapperArgs = ["--add-flags" "\"--log-format\"" "--add-flags" "bar"];})
|
paths = [ pkgs.nix ];
|
||||||
];
|
postBuild = ''
|
||||||
wrappedNixosExecutables = [
|
. ${makeWrapper}
|
||||||
(mkWrappedExecutable {pkg = pkgs.nixos-rebuild; wrapperArgs = ["--add-flags" "\"--log-format\"" "--add-flags" "bar"];})
|
wrapProgram $out/bin/nix-build \
|
||||||
];
|
--add-flags "--log-format" \
|
||||||
wrappedNix = (pkgs.buildEnv {
|
--add-flags "bar${lib.optionalString inEnvironment "-with-logs"}"
|
||||||
|
wrapProgram $out/bin/nix-shell \
|
||||||
|
--add-flags "--log-format" \
|
||||||
|
--add-flags "bar"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
wrappedNixosExecutables = pkgs.symlinkJoin {
|
||||||
|
name = "${pkgs.nixos-rebuild.name}-wrap";
|
||||||
|
paths = [ pkgs.nixos-rebuild ];
|
||||||
|
postBuild = ''
|
||||||
|
. ${makeWrapper}
|
||||||
|
wrapProgram $out/bin/nixos-rebuild \
|
||||||
|
--add-flags "--log-format" \
|
||||||
|
--add-flags "bar"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
wrappedNix = (pkgs.symlinkJoin {
|
||||||
name = "wrappedNix-${pkgs.nix.version}";
|
name = "wrappedNix-${pkgs.nix.version}";
|
||||||
paths = [ pkgs.nix ] ++ wrappedNixExecutables false;
|
paths = [ pkgs.nix ] ++ [( wrappedNixExecutables false )];
|
||||||
}).overrideAttrs {
|
}).overrideAttrs {
|
||||||
version = pkgs.nix.version;
|
version = pkgs.nix.version;
|
||||||
passthru.meta = pkgs.nix.meta;
|
passthru.meta = pkgs.nix.meta;
|
||||||
|
|
Loading…
Add table
Reference in a new issue