public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GCJ 4.4: Try to avoid FastJar since it appears to be broken.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16486
This commit is contained in:
Ludovic Courtès 2009-07-27 23:09:04 +00:00
parent 9b3655cef0
commit 032c603c8b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/gcc-4.4/default.nix
View File

@ -7,14 +7,14 @@
, gmp, mpfr, gettext, which , gmp, mpfr, gettext, which
, ppl ? null, cloogppl ? null # used by the Graphite optimization framework , ppl ? null, cloogppl ? null # used by the Graphite optimization framework
, bison ? null, flex ? null , bison ? null, flex ? null
, fastjar ? null, zlib ? null, boehmgc ? null , zlib ? null, boehmgc ? null
, zip ? null, unzip ? null , zip ? null, unzip ? null
, enableMultilib ? false , enableMultilib ? false
, name ? "gcc" , name ? "gcc"
}: }:
assert langTreelang -> bison != null && flex != null; assert langTreelang -> bison != null && flex != null;
assert langJava -> fastjar != null && zip != null && unzip != null; assert langJava -> zip != null && unzip != null;
with stdenv.lib; with stdenv.lib;
@ -69,7 +69,7 @@ stdenv.mkDerivation ({
++ (optionals langTreelang [bison flex]) ++ (optionals langTreelang [bison flex])
++ (optional (zlib != null) zlib) ++ (optional (zlib != null) zlib)
++ (optional (boehmgc != null) boehmgc) ++ (optional (boehmgc != null) boehmgc)
++ (optionals langJava [fastjar zip unzip]) ++ (optionals langJava [zip unzip])
; ;
configureFlags = " configureFlags = "

2
pkgs/top-level/all-packages.nix
View File

@ -1743,7 +1743,7 @@ let
langCC = true; langCC = true;
langC = false; langC = false;
profiledCompiler = false; profiledCompiler = false;
inherit fastjar zip unzip zlib boehmgc gettext; inherit zip unzip zlib boehmgc gettext;
}); });
#ghc = haskellPackages.ghc; #ghc = haskellPackages.ghc;