diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-05-19 21:27:38 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-05-19 21:27:38 +0000 |
| commit | eeba31dfc9a69fbb0798dcad6293093ccc719de9 (patch) | |
| tree | e609cc5d0ff4e89b8e871cb491159c6ff899bd87 | |
| parent | 8ccb0fda332ac46eaf4a821813c13f50b895a84f (diff) | |
| download | nixlib-eeba31dfc9a69fbb0798dcad6293093ccc719de9.tar nixlib-eeba31dfc9a69fbb0798dcad6293093ccc719de9.tar.gz nixlib-eeba31dfc9a69fbb0798dcad6293093ccc719de9.tar.bz2 nixlib-eeba31dfc9a69fbb0798dcad6293093ccc719de9.tar.lz nixlib-eeba31dfc9a69fbb0798dcad6293093ccc719de9.tar.xz nixlib-eeba31dfc9a69fbb0798dcad6293093ccc719de9.tar.zst nixlib-eeba31dfc9a69fbb0798dcad6293093ccc719de9.zip | |
GNU MIG: Use the date as the version number; remove misguided cross stuff.
svn path=/nixpkgs/trunk/; revision=21893
| -rw-r--r-- | pkgs/development/tools/misc/mig/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/development/tools/misc/mig/default.nix b/pkgs/development/tools/misc/mig/default.nix index d09dc9dd4b03..68951e84e2d5 100644 --- a/pkgs/development/tools/misc/mig/default.nix +++ b/pkgs/development/tools/misc/mig/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a59975f4af44..af68056a7086 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |