@@ -166,22 +166,17 @@ ccache --version
166166EOF
167167
168168# Install nix
169- RUN <<EOF
170- sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --daemon --yes
171-
172- # Source the nix daemon script to make nix available in the current shell.
173- . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
174-
175- # Verify the installation.
176- nix --version
177- EOF
169+ RUN sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --daemon --yes
178170
179171# Add nix to PATH and set NIX environment variables so nix is available in all
180172# shells including non-interactive shells (e.g., GitHub Actions).
181173ENV PATH="/nix/var/nix/profiles/default/bin:${PATH}"
182174ENV NIX_PROFILES="/nix/var/nix/profiles/default"
183175ENV NIX_SSL_CERT_FILE="/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
184176
177+ # Verify the nix installation.
178+ RUN nix --version
179+
185180# Set the Conan home directory, so the users of this image can find the default
186181# profile.
187182ENV HOME=/root
@@ -299,22 +294,17 @@ ccache --version
299294EOF
300295
301296# Install nix
302- RUN <<EOF
303- sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --daemon --yes
304-
305- # Source the nix daemon script to make nix available in the current shell.
306- . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
307-
308- # Verify the installation.
309- nix --version
310- EOF
297+ RUN sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --daemon --yes
311298
312299# Add nix to PATH and set NIX environment variables so nix is available in all
313300# shells including non-interactive shells (e.g., GitHub Actions).
314301ENV PATH="/nix/var/nix/profiles/default/bin:${PATH}"
315302ENV NIX_PROFILES="/nix/var/nix/profiles/default"
316303ENV NIX_SSL_CERT_FILE="/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
317304
305+ # Verify the nix installation.
306+ RUN nix --version
307+
318308# Set the Conan home directory, so the users of this image can find the default
319309# profile.
320310ENV HOME=/root
@@ -349,12 +339,3 @@ cd test && ./run.sh clang
349339cd ..
350340rm -rf test
351341EOF
352-
353-
354-
355-
356-
357-
358-
359-
360-
0 commit comments