Author: ludo
Date: Tue Jun 14 08:08:11 2011
New Revision: 27452
URL: https://svn.nixos.org/websvn/nix/?rev=27452&sc=1
Log:
hurd: `build' -> `xbuild' in `qemu_image'.
Modified:
hydra-config/gnu/trunk/hurd/release.nix
Modified: hydra-config/gnu/trunk/hurd/release.nix
==============================================================================
--- hydra-config/gnu/trunk/hurd/release.nix Tue Jun 14 04:31:30 2011
(r27451)
+++ hydra-config/gnu/trunk/hurd/release.nix Tue Jun 14 08:08:11 2011
(r27452)
@@ -162,7 +162,7 @@
# A bare bones QEMU disk image with GNU/Hurd on partition 1.
# FIXME: Currently hangs at "start ext2fs:".
qemu_image =
- { build ? (jobs.xbuild_without_parted {})
+ { xbuild ? (jobs.xbuild_without_parted {})
, mach ? ((import ../gnumach/release.nix {}).build {}) }:
let
@@ -178,7 +178,7 @@
# Software cross-compiled for GNU to be installed.
gnuDerivations =
- [ mach build
+ [ mach xbuild
pkgs.bash.hostDrv pkgs.coreutils.hostDrv
pkgs.findutils.hostDrv pkgs.gnused.hostDrv
];
@@ -197,7 +197,7 @@
cp -rv "/nix/store/"*-gnu /mnt/nix/store
mkdir /mnt/bin /mnt/dev
- ln -sv "${build}/hurd" /mnt/hurd
+ ln -sv "${xbuild}/hurd" /mnt/hurd
ln -sv "${pkgs.bash.hostDrv}/bin/bash" /mnt/bin/sh
mkdir -p /mnt/boot/grub
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
