From 4095c41c3390d1af9e5f033f6909ea2b34c14365 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 29 Oct 2007 11:29:47 +0000
Subject: [PATCH] * Temporary hack to prevent mass recompiles.
svn path=/nixpkgs/trunk/; revision=9551
---
pkgs/development/compilers/gcc-4.1/default.nix | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/compilers/gcc-4.1/default.nix b/pkgs/development/compilers/gcc-4.1/default.nix
index 1b55469b5b58..e6d5452512e0 100644
--- a/pkgs/development/compilers/gcc-4.1/default.nix
+++ b/pkgs/development/compilers/gcc-4.1/default.nix
@@ -10,7 +10,7 @@ assert langC || langF77;
with import ../../../lib;
-stdenv.mkDerivation {
+stdenv.mkDerivation ({
name = "gcc-4.1.2";
builder = if langF77 then ./fortran.sh else ./builder.sh;
@@ -52,9 +52,6 @@ stdenv.mkDerivation {
passthru = { inherit langC langCC langF77; };
- buildInputs = [] ++ (if gmp != null then [gmp] else [])
- ++ (if mpfr != null then [mpfr] else []);
-
meta = {
homepage = "http://gcc.gnu.org/";
license = "GPL/LGPL";
@@ -65,3 +62,9 @@ stdenv.mkDerivation {
priority = "7";
};
}
+
+// (if gmp != null || mpfr != null then {
+ buildInputs = []
+ ++ (if gmp != null then [gmp] else [])
+ ++ (if mpfr != null then [mpfr] else []);
+} else {}))