From f05d8f31ec944eb5b07a9dbf80b606372e47cb21 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 20 Dec 2018 16:17:05 -0600 Subject: [PATCH] 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 --- nixos/lib/make-disk-image.nix | 2 +- 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 bf32a36895c..6fec322f909 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 01cfe8a02e1..e946c4abc57 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