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

GCJ 4.4: Require some more X libraries.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16493
This commit is contained in:
Ludovic Courtès 2009-07-28 17:49:47 +00:00
parent 992045830e
commit a63eefa27f
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

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

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

@ -1736,7 +1736,7 @@ let
inherit zip unzip zlib boehmgc gettext pkgconfig; inherit zip unzip zlib boehmgc gettext pkgconfig;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gnome) libart_lgpl; inherit (gnome) libart_lgpl;
inherit (xlibs) libX11 libSM libICE libXtst; inherit (xlibs) libX11 libXt libSM libICE libXtst;
}); });
#ghc = haskellPackages.ghc; #ghc = haskellPackages.ghc;