mirror of
https://github.com/NixOS/nix.git
synced 2025-11-08 19:46:02 +01:00
Merge pull request #13620 from NixOS/mergify/bp/2.29-maintenance/pr-13326
docker.nix: Prevent double copy of nixpkgs source tree (backport #13326)
This commit is contained in:
commit
ab4951588b
1 changed files with 6 additions and 1 deletions
|
|
@ -173,7 +173,12 @@ let
|
||||||
channel = pkgs.runCommand "channel-nixos" { inherit bundleNixpkgs; } ''
|
channel = pkgs.runCommand "channel-nixos" { inherit bundleNixpkgs; } ''
|
||||||
mkdir $out
|
mkdir $out
|
||||||
if [ "$bundleNixpkgs" ]; then
|
if [ "$bundleNixpkgs" ]; then
|
||||||
ln -s ${nixpkgs} $out/nixpkgs
|
ln -s ${
|
||||||
|
builtins.path {
|
||||||
|
path = nixpkgs;
|
||||||
|
name = "source";
|
||||||
|
}
|
||||||
|
} $out/nixpkgs
|
||||||
echo "[]" > $out/manifest.nix
|
echo "[]" > $out/manifest.nix
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue