diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-12-20 16:17:05 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-07 16:28:50 -0600 |
| commit | f05d8f31ec944eb5b07a9dbf80b606372e47cb21 (patch) | |
| tree | a4cf67a8c3f1f451bf2278fc704187f8e70c52d1 /nixos | |
| parent | 78cabc3ca9edfd04b93230aa74c132a0f81a2a25 (diff) | |
| download | nixlib-f05d8f31ec944eb5b07a9dbf80b606372e47cb21.tar nixlib-f05d8f31ec944eb5b07a9dbf80b606372e47cb21.tar.gz nixlib-f05d8f31ec944eb5b07a9dbf80b606372e47cb21.tar.bz2 nixlib-f05d8f31ec944eb5b07a9dbf80b606372e47cb21.tar.lz nixlib-f05d8f31ec944eb5b07a9dbf80b606372e47cb21.tar.xz nixlib-f05d8f31ec944eb5b07a9dbf80b606372e47cb21.tar.zst nixlib-f05d8f31ec944eb5b07a9dbf80b606372e47cb21.zip | |
make-disk-image: use filterSource instead of cleanSource
cleanSource does not appear to work correctly in this case. The path does not get coerced to a string, resulting in a dangling symlink produced in channel.nix. Not sure why, but this seems to fix it. Fixes #51025. /cc @elvishjericco
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/make-disk-image.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/installer/cd-dvd/channel.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index bf32a36895c5..6fec322f9095 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -84,7 +84,7 @@ let format' = format; in let # FIXME: merge with channel.nix / make-channel.nix. channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}" {} '' mkdir -p $out - cp -prd ${nixpkgs} $out/nixos + cp -prd ${nixpkgs.outPath} $out/nixos chmod -R u+w $out/nixos if [ ! -e $out/nixos/nixpkgs ]; then ln -s . $out/nixos/nixpkgs diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index 01cfe8a02e10..e946c4abc576 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -16,7 +16,7 @@ let { } '' mkdir -p $out - cp -prd ${nixpkgs} $out/nixos + cp -prd ${nixpkgs.outPath} $out/nixos chmod -R u+w $out/nixos if [ ! -e $out/nixos/nixpkgs ]; then ln -s . $out/nixos/nixpkgs |