diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-07 16:29:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-07 16:29:58 -0600 |
| commit | 04373fd3ccf9034b0cee050a485fa30ac00cfd76 (patch) | |
| tree | d0ec2a0733e91fb6d20cf91642a6dbae4f26e77e /nixos/modules | |
| parent | 59667421a14622e5f0c09ab7c7addb2699926950 (diff) | |
| parent | f05d8f31ec944eb5b07a9dbf80b606372e47cb21 (diff) | |
| download | nixpkgs-04373fd3ccf9034b0cee050a485fa30ac00cfd76.tar nixpkgs-04373fd3ccf9034b0cee050a485fa30ac00cfd76.tar.gz nixpkgs-04373fd3ccf9034b0cee050a485fa30ac00cfd76.tar.bz2 nixpkgs-04373fd3ccf9034b0cee050a485fa30ac00cfd76.tar.lz nixpkgs-04373fd3ccf9034b0cee050a485fa30ac00cfd76.tar.xz nixpkgs-04373fd3ccf9034b0cee050a485fa30ac00cfd76.tar.zst nixpkgs-04373fd3ccf9034b0cee050a485fa30ac00cfd76.zip | |
Merge pull request #52594 from matthewbauer/fix-51025
make-disk-image: use filterSource instead of cleanSource
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/channel.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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 |