GNU MIG: Use the date as the version number; remove misguided cross stuff.

svn path=/nixpkgs/trunk/; revision=21893
This commit is contained in:
Ludovic Courtès 2010-05-19 21:27:38 +00:00
parent 8ccb0fda33
commit eeba31dfc9
2 changed files with 13 additions and 10 deletions

View file

@ -1,9 +1,11 @@
{ fetchgit, stdenv, autoconf, automake, flex, bison, machHeaders
, cross ? null }:
{ fetchgit, stdenv, autoconf, automake, flex, bison, machHeaders }:
let rev = "4fee6a5652f609cb68cdbd9049d4da7a194f15f8"; in
stdenv.mkDerivation rec {
name = "mig-1.4-${rev}";
let
date = "2010-05-12";
rev = "master@{${date}}";
in
stdenv.mkDerivation {
name = "mig-${date}";
src = fetchgit {
url = "git://git.sv.gnu.org/hurd/mig.git";
@ -15,8 +17,9 @@ stdenv.mkDerivation rec {
preConfigure = "autoreconf -vfi";
configureFlags =
stdenv.lib.optionalString (cross != null) "--build=${cross.config}";
configureFlags = [ "--build=i586-pc-gnu" ];
doCheck = true;
meta = {
description = "GNU MIG, the Mach interface generator";

View file

@ -3256,10 +3256,10 @@ let
inherit fetchurl stdenv builderDefs stringsWithDeps lib elfutils;
};
migCross = forceBuildDrv (import ../development/tools/misc/mig {
mig = import ../development/tools/misc/mig {
inherit fetchgit stdenv autoconf automake flex bison machHeaders;
cross = assert crossSystem != null; crossSystem;
});
};
migCross = mig; # FIXME: Remove me.
mk = import ../development/tools/build-managers/mk {
inherit fetchurl stdenv;