forked from mirrors/nixpkgs
* Take the target platform as a parameter.
* Put the platform name in the name of the ISO image. svn path=/nixos/trunk/; revision=8364
This commit is contained in:
parent
8452dd3cd0
commit
36f01930ed
|
@ -1,3 +1,6 @@
|
||||||
|
{ platform ? __currentSystem
|
||||||
|
}:
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
|
|
||||||
|
|
||||||
|
@ -77,7 +80,7 @@ rec {
|
||||||
|
|
||||||
|
|
||||||
system = import ../system/system.nix {
|
system = import ../system/system.nix {
|
||||||
inherit configuration;
|
inherit configuration platform;
|
||||||
stage2Init = "/init";
|
stage2Init = "/init";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -139,7 +142,7 @@ rec {
|
||||||
# init.
|
# init.
|
||||||
rescueCD = import ../helpers/make-iso9660-image.nix {
|
rescueCD = import ../helpers/make-iso9660-image.nix {
|
||||||
inherit (pkgs) stdenv perl cdrtools;
|
inherit (pkgs) stdenv perl cdrtools;
|
||||||
isoName = "nixos.iso";
|
isoName = "nixos-${platform}.iso";
|
||||||
|
|
||||||
# Single files to be copied to fixed locations on the CD.
|
# Single files to be copied to fixed locations on the CD.
|
||||||
contents = [
|
contents = [
|
||||||
|
|
Loading…
Reference in a new issue