extra-container: 0.8 -> 0.10

This commit is contained in:
Erik Arvstedt 2022-06-26 17:11:35 +02:00
parent ec996b2d0c
commit ca12710b06
No known key found for this signature in database
GPG Key ID: 33312B944DD97846

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "extra-container"; pname = "extra-container";
version = "0.8"; version = "0.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "erikarvstedt"; owner = "erikarvstedt";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-/AetqDPkz32JMdjbSdzZCBVmGbvzjeAb8Wv82iTgHFE="; hash = "sha256-vtCZ0w1Kaiw9bIrzwEb4Jnv7QoQLp8JDjaGmAP91hpE=";
}; };
buildCommand = '' buildCommand = ''
@ -18,13 +18,14 @@ stdenv.mkDerivation rec {
install $src/eval-config.nix -Dt $share install $src/eval-config.nix -Dt $share
# Use existing PATH for systemctl and machinectl # 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 \ sed -i "
-e "s|evalConfig=.*|evalConfig=$share/eval-config.nix|" \ s|evalConfig=.*|evalConfig=$share/eval-config.nix|
-e "s|LOCALE_ARCHIVE=.*|LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive|" \ s|LOCALE_ARCHIVE=.*|LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive|
-e "2i$scriptPath" \ 2i$scriptPath
$out/bin/extra-container 2inixosContainer=${nixos-container}/bin
" $out/bin/extra-container
''; '';
meta = with lib; { meta = with lib; {