* Don't include the services tree. It shouldn't be needed except for
some legacy stuff. (And it broke the ISO build for the last month or so.) svn path=/nixos/trunk/; revision=15822
This commit is contained in:
parent
365df3e29a
commit
5ed2a75f50
|
@ -5,7 +5,6 @@
|
|||
else "nixos-${builtins.readFile ../../VERSION}"
|
||||
, compressImage ? false
|
||||
, nixpkgs ? ../../../nixpkgs
|
||||
, services ? ../../../services
|
||||
# This option allows easy building of Rescue CD with
|
||||
# modified package set / driver set / anything.
|
||||
# For easier maitenance, let overrider know the current
|
||||
|
@ -129,8 +128,6 @@ rec {
|
|||
tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
|
||||
mkdir -p /etc/nixos/nixpkgs
|
||||
tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
|
||||
mkdir -p /etc/nixos/services
|
||||
tar xjf /install/services.tar.bz2 -C /etc/nixos/services
|
||||
chown -R root.root /etc/nixos
|
||||
end script
|
||||
";
|
||||
|
@ -206,10 +203,6 @@ rec {
|
|||
nixosTarball = makeTarball "nixos.tar.bz2" ../..;
|
||||
|
||||
|
||||
# Put Services in a tarball.
|
||||
servicesTarball = makeTarball "services.tar.bz2" services;
|
||||
|
||||
|
||||
# Put Nixpkgs in a tarball.
|
||||
nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgs;
|
||||
|
||||
|
@ -276,9 +269,6 @@ rec {
|
|||
{ source = nixpkgsTarball + "/nixpkgs.tar.bz2";
|
||||
target = "/install/nixpkgs.tar.bz2";
|
||||
}
|
||||
{ source = servicesTarball + "/services.tar.bz2";
|
||||
target = "/install/services.tar.bz2";
|
||||
}
|
||||
];
|
||||
|
||||
# Closures to be copied to the Nix store on the CD.
|
||||
|
|
Loading…
Reference in New Issue