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

make sure we always have mktemp, by building our own version first using Nix.

Browse Source 
This makes it a bit more pure to build the NixOS iso. Still room for improvement though...

svn path=/nixu/trunk/; revision=5559
This commit is contained in:
Armijn Hemel 2006-07-02 22:37:40 +00:00
parent 32c8535c4d
commit e76efef0d0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make-disk.sh
View File

@ -3,7 +3,13 @@
# deps is an array # deps is an array
declare -a deps declare -a deps
archivesDir=$(mktemp -d) # determine where we can find the Nix binaries
NIX=$(dirname $(which nix-store))
# make sure we use our own mktemp, because it is more pure
mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instantiate -))
archivesDir=$($mktemp/bin/mktemp -d)
manifest=${archivesDir}/MANIFEST manifest=${archivesDir}/MANIFEST
nixpkgs=/nixpkgs/trunk/pkgs nixpkgs=/nixpkgs/trunk/pkgs
fill_disk=$archivesDir/scripts/fill-disk.sh fill_disk=$archivesDir/scripts/fill-disk.sh
@ -15,8 +21,6 @@ initrd=/tmp/initram.img
initdir=${archivesDir}/initdir initdir=${archivesDir}/initdir
initscript=$archivesDir/scripts/init.sh initscript=$archivesDir/scripts/init.sh
# determine where we can find the Nix binaries
NIX=$(dirname $(which nix-store))
storeExpr=$($NIX/nix-store -qR $($NIX/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -))) storeExpr=$($NIX/nix-store -qR $($NIX/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
#$NIX/nix-push --copy $archivesDir $manifest $($NIX/nix-store -r $storeExpr) $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) #$NIX/nix-push --copy $archivesDir $manifest $($NIX/nix-store -r $storeExpr) $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))

2
pkgs.nix
View File

@ -5,7 +5,7 @@ rec {
nettools nixUnstable subversion gcc wget which vim less screen openssh binutils nettools nixUnstable subversion gcc wget which vim less screen openssh binutils
strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev
dhcpWrapper man nano eject sysklogd kudzu xawtv; dhcpWrapper man nano eject sysklogd kudzu xawtv mktemp;
boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
utillinux utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which vim utillinux utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which vim