diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-07-28 12:02:51 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-07-28 12:02:51 +0000 |
| commit | 992045830eb90518634b1a49cab448af3460e34f (patch) | |
| tree | 27400134f00eae2aeac232ef4b9680873c45c53f /pkgs/development/compilers/gcc-4.4 | |
| parent | 86ad964255c4468f3f8534d4fa294e9c0bf7ba18 (diff) | |
| download | nixlib-992045830eb90518634b1a49cab448af3460e34f.tar nixlib-992045830eb90518634b1a49cab448af3460e34f.tar.gz nixlib-992045830eb90518634b1a49cab448af3460e34f.tar.bz2 nixlib-992045830eb90518634b1a49cab448af3460e34f.tar.lz nixlib-992045830eb90518634b1a49cab448af3460e34f.tar.xz nixlib-992045830eb90518634b1a49cab448af3460e34f.tar.zst nixlib-992045830eb90518634b1a49cab448af3460e34f.zip | |
GCJ 4.4: Require various X libraries.
svn path=/nixpkgs/trunk/; revision=16492
Diffstat (limited to 'pkgs/development/compilers/gcc-4.4')
| -rw-r--r-- | pkgs/development/compilers/gcc-4.4/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index 347ef8a72bd7..ed33c5ded078 100644 --- a/pkgs/development/compilers/gcc-4.4/default.nix +++ b/pkgs/development/compilers/gcc-4.4/default.nix @@ -9,7 +9,7 @@ , bison ? null, flex ? null , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null -, libXtst ? null +, libX11 ? null, libSM ? null, libICE ? null, libXtst ? null , enableMultilib ? false , name ? "gcc" }: @@ -17,7 +17,8 @@ assert langTreelang -> bison != null && flex != null; assert langJava -> zip != null && unzip != null; assert gtk != null -> pkgconfig != null && libart_lgpl != null - && libXtst != null; + && libX11 != null && libSM != null + && libICE != null && libXtst != null; with stdenv.lib; @@ -73,7 +74,8 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optional (boehmgc != null) boehmgc) ++ (optionals langJava [zip unzip]) - ++ (optionals (gtk != null) [gtk pkgconfig libart_lgpl libXtst]) + ++ (optionals (gtk != null) + [gtk pkgconfig libart_lgpl libX11 libSM libICE libXtst]) ; configureFlags = " |