From 50d021364af568249cee9e184eadcfb0f764620a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Sep 2004 19:50:58 +0000 Subject: [PATCH] * Build UML with gcc 3.3, since gcc 3.4 makes it crash at startup. svn path=/nixpkgs/trunk/; revision=1524 --- pkgs/misc/uml/default.nix | 3 ++- pkgs/system/all-packages-generic.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/uml/default.nix b/pkgs/misc/uml/default.nix index 06266cbb9b5..f420890e21f 100644 --- a/pkgs/misc/uml/default.nix +++ b/pkgs/misc/uml/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, m4}: +{stdenv, fetchurl, perl, m4, gcc}: assert perl != null && m4 != null; @@ -20,4 +20,5 @@ stdenv.mkDerivation { # hostfsAccessPatch = ./hostfs-access.patch; config = ./config; buildInputs = [perl m4]; + NIX_GCC = gcc; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 438adcbae20..0b6699a2080 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -895,6 +895,7 @@ rec { uml = (import ../misc/uml) { inherit fetchurl stdenv perl; m4 = gnum4; + gcc = gcc33; }; umlutilities = (import ../misc/uml-utilities) {