public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixes.

Browse Source 
svn path=/nixu/trunk/; revision=6937
This commit is contained in:
Eelco Dolstra 2006-11-03 09:49:34 +00:00
parent 6eb94a9bfd
commit 412fcfe2f7
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make-disk.sh
View File

@ -24,7 +24,6 @@ gzip=$($build ./pkgs.nix -A gzip)
cpio=$($build ./pkgs.nix -A cpio) cpio=$($build ./pkgs.nix -A cpio)
archivesDir=$($mktemp/bin/mktemp -d) archivesDir=$($mktemp/bin/mktemp -d)
archivesDir2=$($mktemp/bin/mktemp -d)
manifest=${archivesDir}/MANIFEST manifest=${archivesDir}/MANIFEST
nixpkgs=./pkgs nixpkgs=./pkgs
fill_disk=$archivesDir/scripts/fill-disk.sh fill_disk=$archivesDir/scripts/fill-disk.sh
@ -55,7 +54,6 @@ mkinitrd=$($build ./pkgs.nix -A mkinitrd)
### make NAR files for everything we want to install and some more. Make sure ### make NAR files for everything we want to install and some more. Make sure
### the right URL is in there, so specify /cdrom and not cdrom ### the right URL is in there, so specify /cdrom and not cdrom
$NIX/nix-push --copy $archivesDir $manifest --target file:///cdrom $storeExpr $($build ./pkgs.nix -A kernel) $kernelscripts $mkinitrd $NIX/nix-push --copy $archivesDir $manifest --target file:///cdrom $storeExpr $($build ./pkgs.nix -A kernel) $kernelscripts $mkinitrd
#$NIX/nix-push --copy $archivesDir2 $manifest --target http://losser.labs.cs.uu.nl/~armijn/.nix $storeExpr $($build ./pkgs.nix -A kernel) $kernelscripts
# Location of sysvinit? # Location of sysvinit?
sysvinitPath=$($build ./pkgs.nix -A sysvinit) sysvinitPath=$($build ./pkgs.nix -A sysvinit)
@ -106,7 +104,7 @@ done
tar zcf ${archivesDir}/nixstore.tgz $combideps tar zcf ${archivesDir}/nixstore.tgz $combideps
utilLinux=$($build ./pkgs.nix -A utillinuxStatic) utilLinux=$($build ./pkgs.nix -A utillinuxStatic)
coreUtilsDiet=$($NIX/nix-store -qR $($build ./pkgs.nix -A coreutilsDiet)) coreUtilsDiet=$($build ./pkgs.nix -A diet.coreutils)
## temporarily normal e2fsprogs until I can get it to build with dietlibc ## temporarily normal e2fsprogs until I can get it to build with dietlibc
e2fsProgs=$($NIX/nix-store -qR $($build ./pkgs.nix -A e2fsprogsDiet)) e2fsProgs=$($NIX/nix-store -qR $($build ./pkgs.nix -A e2fsprogsDiet))