File tree Expand file tree Collapse file tree 3 files changed +28
-0
lines changed
Expand file tree Collapse file tree 3 files changed +28
-0
lines changed Original file line number Diff line number Diff line change @@ -46,6 +46,7 @@ pkgs+=(binutils-gold) # Required build tool.
4646pkgs+=(curl) # Dependency for tools requiring downloading data.
4747pkgs+=(dpkg-dev) # Required packaging tool.
4848pkgs+=(debhelper) # Required packaging tool.
49+ pkgs+=(xz-utils) # Required to install nix
4950pkgs+=(file) # Required packaging tool.
5051pkgs+=(git) # Required build tool.
5152pkgs+=(gpg) # Dependency for tools requiring signing or encrypting/decrypting.
@@ -191,6 +192,14 @@ rm -rf ccache-${CCACHE_VERSION}
191192ccache --version
192193EOF
193194
195+ # Install nix
196+ RUN <<EOF
197+ sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --daemon
198+
199+ # Verify the installation. Should be run from a new shell.
200+ bash -c 'nix --version'
201+ EOF
202+
194203# Set the Conan home directory, so the users of this image can find the default
195204# profile.
196205ENV HOME=/root
Original file line number Diff line number Diff line change @@ -56,6 +56,8 @@ pkgs+=(rpm-build) # Required packaging tool.
5656pkgs+=(unzip) # Dependency for tools requiring unzipping files.
5757pkgs+=(vim) # Text editor.
5858pkgs+=(wget) # Required build tool.
59+ pkgs+=(curl) # Required to install nix
60+ pkgs+=(xz) # Required to install nix
5961dnf update -y
6062dnf install -y --allowerasing --setopt=tsflags=nodocs "${pkgs[@]}"
6163dnf clean -y all
@@ -306,6 +308,14 @@ rm -rf ccache-${CCACHE_VERSION}
306308ccache --version
307309EOF
308310
311+ # Install nix
312+ RUN <<EOF
313+ sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --daemon
314+
315+ # Verify the installation. Should be run from a new shell.
316+ bash -c 'nix --version'
317+ EOF
318+
309319# Set the Conan home directory, so the users of this image can find the default
310320# profile.
311321ENV HOME=/root
Original file line number Diff line number Diff line change @@ -29,6 +29,7 @@ pkgs+=(ca-certificates) # Enable TLS verification for HTTPS connections by provi
2929pkgs+=(binutils-gold) # Required build tool.
3030pkgs+=(curl) # Dependency for tools requiring downloading data.
3131pkgs+=(dpkg-dev) # Required packaging tool.
32+ pkgs+=(xz-utils) # Required to install nix
3233pkgs+=(file) # Required packaging tool.
3334pkgs+=(git) # Required build tool.
3435pkgs+=(gpg) # Dependency for tools requiring signing or encrypting/decrypting.
@@ -164,6 +165,14 @@ rm -rf ccache-${CCACHE_VERSION}
164165ccache --version
165166EOF
166167
168+ # Install nix
169+ RUN <<EOF
170+ sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --daemon
171+
172+ # Verify the installation. Should be run from a new shell.
173+ bash -c 'nix --version'
174+ EOF
175+
167176# Set the Conan home directory, so the users of this image can find the default
168177# profile.
169178ENV HOME=/root
You can’t perform that action at this time.
0 commit comments