* Conform to build farm conventions.
svn path=/nixu/trunk/; revision=6948
This commit is contained in:
parent
eb1c50ebc9
commit
b3c6510393
|
@ -1,7 +1,5 @@
|
||||||
source $stdenv/setup
|
source $stdenv/setup
|
||||||
|
|
||||||
ensureDir $out
|
|
||||||
|
|
||||||
if test -n "$bootable"; then
|
if test -n "$bootable"; then
|
||||||
bootFlags="-b $bootImage -c boot.cat -no-emul-boot -boot-load-size 4"
|
bootFlags="-b $bootImage -c boot.cat -no-emul-boot -boot-load-size 4"
|
||||||
fi
|
fi
|
||||||
|
@ -27,5 +25,9 @@ if test -n "$init"; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# !!! -f is a quick hack.
|
# !!! -f is a quick hack.
|
||||||
mkisofs -r -J -o $out/$isoName $bootFlags \
|
ensureDir $out/files
|
||||||
|
mkisofs -r -J -o $out/files/$isoName $bootFlags \
|
||||||
-graft-points $graftList
|
-graft-points $graftList
|
||||||
|
|
||||||
|
ensureDir $out/nix-support
|
||||||
|
echo $system > $out/nix-support/system
|
||||||
|
|
|
@ -1,12 +1,16 @@
|
||||||
|
{system ? __currentSystem}:
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
|
|
||||||
pkgs = import ./pkgs/top-level/all-packages.nix {};
|
pkgs = import ./pkgs/top-level/all-packages.nix {inherit system;};
|
||||||
|
|
||||||
pkgsDiet = import ./pkgs/top-level/all-packages.nix {
|
pkgsDiet = import ./pkgs/top-level/all-packages.nix {
|
||||||
|
inherit system;
|
||||||
bootStdenv = pkgs.useDietLibC pkgs.stdenv;
|
bootStdenv = pkgs.useDietLibC pkgs.stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
pkgsStatic = import ./pkgs/top-level/all-packages.nix {
|
pkgsStatic = import ./pkgs/top-level/all-packages.nix {
|
||||||
|
inherit system;
|
||||||
bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
|
bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue