diff options
| author | Lassulus <github@lassul.us> | 2022-06-26 18:23:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-26 18:23:00 +0200 |
| commit | 9d9bc0e9f1a234eaffd68b035c66be323976bee0 (patch) | |
| tree | 78399fb7f8f288dd9e0afc452cd972be92f4b6e4 | |
| parent | Merge pull request #179185 from NixOS/backport-179175-to-release-22.05 (diff) | |
| parent | extra-container: 0.8 -> 0.10 (diff) | |
| download | nixpkgs-9d9bc0e9f1a234eaffd68b035c66be323976bee0.tar.gz | |
Merge pull request #179202 from NixOS/backport-179198-to-release-22.05
[Backport release-22.05] extra-container: 0.8 -> 0.10
| -rw-r--r-- | pkgs/tools/virtualization/extra-container/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/tools/virtualization/extra-container/default.nix b/pkgs/tools/virtualization/extra-container/default.nix index dad7a3d1be72..a3d185a0099b 100644 --- a/pkgs/tools/virtualization/extra-container/default.nix +++ b/pkgs/tools/virtualization/extra-container/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "extra-container"; - version = "0.8"; + version = "0.10"; src = fetchFromGitHub { owner = "erikarvstedt"; repo = pname; rev = version; - hash = "sha256-/AetqDPkz32JMdjbSdzZCBVmGbvzjeAb8Wv82iTgHFE="; + hash = "sha256-vtCZ0w1Kaiw9bIrzwEb4Jnv7QoQLp8JDjaGmAP91hpE="; }; buildCommand = '' @@ -18,13 +18,14 @@ stdenv.mkDerivation rec { install $src/eval-config.nix -Dt $share # Use existing PATH for systemctl and machinectl - scriptPath="export PATH=${lib.makeBinPath [ nixos-container openssh ]}:\$PATH" + scriptPath="export PATH=${lib.makeBinPath [ openssh ]}:\$PATH" - sed -i \ - -e "s|evalConfig=.*|evalConfig=$share/eval-config.nix|" \ - -e "s|LOCALE_ARCHIVE=.*|LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive|" \ - -e "2i$scriptPath" \ - $out/bin/extra-container + sed -i " + s|evalConfig=.*|evalConfig=$share/eval-config.nix| + s|LOCALE_ARCHIVE=.*|LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive| + 2i$scriptPath + 2inixosContainer=${nixos-container}/bin + " $out/bin/extra-container ''; meta = with lib; { |