diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-15 17:52:02 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-15 17:52:02 +0200 |
| commit | 84854877270823cad9b8be0331c92cc90425d123 (patch) | |
| tree | d0d503b444ed3d6aee9b579b2485ed6928b5cbd8 /nixos | |
| parent | ceb8ab7ffa9435a66568bba17d153c82a4e4e824 (diff) | |
| download | nixlib-84854877270823cad9b8be0331c92cc90425d123.tar nixlib-84854877270823cad9b8be0331c92cc90425d123.tar.gz nixlib-84854877270823cad9b8be0331c92cc90425d123.tar.bz2 nixlib-84854877270823cad9b8be0331c92cc90425d123.tar.lz nixlib-84854877270823cad9b8be0331c92cc90425d123.tar.xz nixlib-84854877270823cad9b8be0331c92cc90425d123.tar.zst nixlib-84854877270823cad9b8be0331c92cc90425d123.zip | |
Get rid of <nixpkgs>
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/channel.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index 987b85d61656..c6e0f1577bb1 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -14,10 +14,7 @@ let { expr = builtins.readFile ../../../lib/channel-expr.nix; } '' mkdir -p $out/nixos - # 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 + cp -prd ${pkgs.path} $out/nixos/nixpkgs ln -s nixpkgs/nixos $out/nixos/nixos chmod -R u+w $out/nixos rm -rf $out/nixos/nixpkgs/.git |