forked from mirrors/nixpkgs
* Build UML with gcc 3.3, since gcc 3.4 makes it crash at startup.
svn path=/nixpkgs/trunk/; revision=1524
This commit is contained in:
parent
3016830968
commit
50d021364a
|
@ -1,4 +1,4 @@
|
||||||
{stdenv, fetchurl, perl, m4}:
|
{stdenv, fetchurl, perl, m4, gcc}:
|
||||||
|
|
||||||
assert perl != null && m4 != null;
|
assert perl != null && m4 != null;
|
||||||
|
|
||||||
|
@ -20,4 +20,5 @@ stdenv.mkDerivation {
|
||||||
# hostfsAccessPatch = ./hostfs-access.patch;
|
# hostfsAccessPatch = ./hostfs-access.patch;
|
||||||
config = ./config;
|
config = ./config;
|
||||||
buildInputs = [perl m4];
|
buildInputs = [perl m4];
|
||||||
|
NIX_GCC = gcc;
|
||||||
}
|
}
|
||||||
|
|
|
@ -895,6 +895,7 @@ rec {
|
||||||
uml = (import ../misc/uml) {
|
uml = (import ../misc/uml) {
|
||||||
inherit fetchurl stdenv perl;
|
inherit fetchurl stdenv perl;
|
||||||
m4 = gnum4;
|
m4 = gnum4;
|
||||||
|
gcc = gcc33;
|
||||||
};
|
};
|
||||||
|
|
||||||
umlutilities = (import ../misc/uml-utilities) {
|
umlutilities = (import ../misc/uml-utilities) {
|
||||||
|
|
Loading…
Reference in a new issue