git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #52594 from matthewbauer/fix-51025

make-disk-image: use filterSource instead of cleanSource

commit04373fd3ccf9034b0cee050a485fa30ac00cfd76 authorMatthew Bauer <mjbauer95@gmail.com> dateMon 7 Jan 2019, 16:29 (8 years ago) parent5966742f05d8f3
2 files changed+2−2
nixos/lib/make-disk-image.nix+1−1 nixos/modules/installer/cd-dvd/channel.nix+1−1
nixos/lib/make-disk-image.nix+1−1
@@ -84,7 +84,7 @@ let format' = format; in let
8484 # FIXME: merge with channel.nix / make-channel.nix.
8585 channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}" {} ''
8686 mkdir -p $out
87− cp -prd ${nixpkgs} $out/nixos
87+ cp -prd ${nixpkgs.outPath} $out/nixos
8888 chmod -R u+w $out/nixos
8989 if [ ! -e $out/nixos/nixpkgs ]; then
9090 ln -s . $out/nixos/nixpkgs
nixos/modules/installer/cd-dvd/channel.nix+1−1
@@ -16,7 +16,7 @@ let
1616 { }
1717 ''
1818 mkdir -p $out
19− cp -prd ${nixpkgs} $out/nixos
19+ cp -prd ${nixpkgs.outPath} $out/nixos
2020 chmod -R u+w $out/nixos
2121 if [ ! -e $out/nixos/nixpkgs ]; then
2222 ln -s . $out/nixos/nixpkgs