From 79a039080c1f3259037b8ad5da3037e72ebea051 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 2 Feb 2009 12:44:20 +0000 Subject: [PATCH] svn path=/nixpkgs/trunk/; revision=13951 --- pkgs/development/compilers/gcc-apple/builder.sh | 2 +- pkgs/development/compilers/gcc-apple/default.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcc-apple/builder.sh b/pkgs/development/compilers/gcc-apple/builder.sh index 4ff75309ea74..8485b6efec0f 100644 --- a/pkgs/development/compilers/gcc-apple/builder.sh +++ b/pkgs/development/compilers/gcc-apple/builder.sh @@ -60,7 +60,7 @@ preConfigure() { langs="$langs,c++" fi if test -n "$langF77"; then - langs="$langs,f77" + langs="$langs,f95" fi # Perform the build in a different directory. diff --git a/pkgs/development/compilers/gcc-apple/default.nix b/pkgs/development/compilers/gcc-apple/default.nix index 6044a93a70fa..a5f89455501f 100644 --- a/pkgs/development/compilers/gcc-apple/default.nix +++ b/pkgs/development/compilers/gcc-apple/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, noSysDirs , langC ? true, langCC ? true, langF77 ? false , profiledCompiler ? false +, gmp ? null, mpfr ? null, bison ? null, flex ? null }: assert langC; assert stdenv.isDarwin; +assert langF77 -> gmp != null; -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "gcc-4.0.1-apple-5341"; builder = ./builder.sh; src = fetchurl { @@ -17,4 +19,4 @@ stdenv.mkDerivation { [./pass-cxxcpp.patch] ++ (if noSysDirs then [./no-sys-dirs.patch] else []); inherit noSysDirs langC langCC langF77 profiledCompiler; -} +} // (if langF77 then {buildInputs = [gmp mpfr bison flex];} else {}))