MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/tools/misc/mig/default.nix
View file

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

6
pkgs/top-level/all-packages.nix
View file

@ -3256,10 +3256,10 @@ let
inherit fetchurl stdenv builderDefs stringsWithDeps lib elfutils; 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; 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 { mk = import ../development/tools/build-managers/mk {
inherit fetchurl stdenv; inherit fetchurl stdenv;