Skip to content

Commit

Permalink
nixos-container: avoid substituteAll
Browse files Browse the repository at this point in the history
  • Loading branch information
philiptaron committed Jul 26, 2024
1 parent 89f8cdb commit c89f4ad
Showing 1 changed file with 32 additions and 26 deletions.
58 changes: 32 additions & 26 deletions pkgs/tools/virtualization/nixos-container/default.nix
Original file line number Diff line number Diff line change
@@ -1,39 +1,45 @@
{ substituteAll
{ substitute
, perl
, shadow
, util-linux
, runtimeShell
, configurationDirectory ? "/etc/nixos-containers"
, stateDirectory ? "/var/lib/nixos-containers"
, nixosTests
}:

substituteAll {
name = "nixos-container";
dir = "bin";
isExecutable = true;
src = ./nixos-container.pl;
perl = perl.withPackages (p: [ p.FileSlurp ]);
su = "${shadow.su}/bin/su";
utillinux = util-linux;
substitute {
name = "nixos-container";
dir = "bin";
isExecutable = true;
src = ./nixos-container.pl;

inherit configurationDirectory stateDirectory;
substitutions = [
"--subst-var-by" "configurationDirectory" configurationDirectory
"--subst-var-by" "perl" (perl.withPackages (p: [ p.FileSlurp ]))
"--subst-var-by" "stateDirectory" stateDirectory
"--subst-var-by" "su" "${shadow.su}/bin/su"
"--subst-var-by" "utillinux" util-linux
"--subst-var-by" "shell" runtimeShell
];

passthru = {
tests = {
inherit (nixosTests)
containers-imperative
containers-ip
containers-tmpfs
containers-ephemeral
containers-unified-hierarchy
;
};
passthru = {
tests = {
inherit (nixosTests)
containers-imperative
containers-ip
containers-tmpfs
containers-ephemeral
containers-unified-hierarchy
;
};
};

postInstall = ''
t=$out/share/bash-completion/completions
mkdir -p $t
cp ${./nixos-container-completion.sh} $t/nixos-container
'';
meta.mainProgram = "nixos-container";
postInstall = ''
t=$out/share/bash-completion/completions
mkdir -p $t
cp ${./nixos-container-completion.sh} $t/nixos-container
'';

meta.mainProgram = "nixos-container";
}

0 comments on commit c89f4ad

Please sign in to comment.