summary refs log tree commit diff
path: root/nixos/modules/installer/cd-dvd/channel.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixos/modules/installer/cd-dvd/channel.nix')
-rw-r--r--nixos/modules/installer/cd-dvd/channel.nix14
1 files changed, 9 insertions, 5 deletions
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index 8126ce46dd9..987b85d6165 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -14,11 +14,15 @@ let
     { expr = builtins.readFile ../../../lib/channel-expr.nix; }
     ''
       mkdir -p $out/nixos
-      cp -prd ${cleanSource ../../..} $out/nixos/nixos
-      cp -prd ${cleanSource <nixpkgs>} $out/nixos/nixpkgs
-      chmod -R u+w $out/nixos/nixos
-      echo -n ${config.system.nixosVersion} > $out/nixos/nixos/.version
-      echo -n "" > $out/nixos/nixos/.version-suffix
+      # FIXME: should use ../../../.. instead of <nixpkgs>, but that
+      # doesn't work properly if <nixos> is a symlink to
+      # nixpkgs/nixos.
+      cp -prd ${<nixpkgs>} $out/nixos/nixpkgs
+      ln -s nixpkgs/nixos $out/nixos/nixos
+      chmod -R u+w $out/nixos
+      rm -rf $out/nixos/nixpkgs/.git
+      echo -n ${config.system.nixosVersion} > $out/nixos/nixpkgs/.version
+      echo -n "" > $out/nixos/nixpkgs/.version-suffix
       echo "$expr" > $out/nixos/default.nix
     '';