ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

GCJ 4.4: Require libart.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16490
This commit is contained in:
Ludovic Courtès 2009-07-28 09:23:40 +00:00
parent 1228ff02b7
commit a5a5cbe93d
2 changed files with 4 additions and 3 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

@ -8,14 +8,14 @@
, 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
, zlib ? null, boehmgc ? null , zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, gtk ? null, pkgconfig ? null , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
, enableMultilib ? false , enableMultilib ? false
, name ? "gcc" , name ? "gcc"
}: }:
assert langTreelang -> bison != null && flex != null; assert langTreelang -> bison != null && flex != null;
assert langJava -> zip != null && unzip != null; assert langJava -> zip != null && unzip != null;
assert gtk != null -> pkgconfig != null; assert gtk != null -> pkgconfig != null && libart_lgpl != null;
with stdenv.lib; with stdenv.lib;
@ -71,7 +71,7 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib) ++ (optional (zlib != null) zlib)
++ (optional (boehmgc != null) boehmgc) ++ (optional (boehmgc != null) boehmgc)
++ (optionals langJava [zip unzip]) ++ (optionals langJava [zip unzip])
++ (optionals (gtk != null) [gtk pkgconfig]) ++ (optionals (gtk != null) [gtk pkgconfig libart_lgpl])
; ;
configureFlags = " configureFlags = "

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

@ -1735,6 +1735,7 @@ let
profiledCompiler = false; profiledCompiler = false;
inherit zip unzip zlib boehmgc gettext pkgconfig; inherit zip unzip zlib boehmgc gettext pkgconfig;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gnome) libart_lgpl;
}); });
#ghc = haskellPackages.ghc; #ghc = haskellPackages.ghc;