diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-07-28 10:29:18 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-07-28 10:29:18 +0000 |
| commit | 86ad964255c4468f3f8534d4fa294e9c0bf7ba18 (patch) | |
| tree | 5c1dda2140cfd1963a99dc28ea04f4941dcef931 /pkgs/development/compilers/gcc-4.4 | |
| parent | a5a5cbe93d1003326cfe43dc1666e27f2db84df8 (diff) | |
| download | nixlib-86ad964255c4468f3f8534d4fa294e9c0bf7ba18.tar nixlib-86ad964255c4468f3f8534d4fa294e9c0bf7ba18.tar.gz nixlib-86ad964255c4468f3f8534d4fa294e9c0bf7ba18.tar.bz2 nixlib-86ad964255c4468f3f8534d4fa294e9c0bf7ba18.tar.lz nixlib-86ad964255c4468f3f8534d4fa294e9c0bf7ba18.tar.xz nixlib-86ad964255c4468f3f8534d4fa294e9c0bf7ba18.tar.zst nixlib-86ad964255c4468f3f8534d4fa294e9c0bf7ba18.zip | |
GCJ 4.4: Require libXtst.
svn path=/nixpkgs/trunk/; revision=16491
Diffstat (limited to 'pkgs/development/compilers/gcc-4.4')
| -rw-r--r-- | pkgs/development/compilers/gcc-4.4/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index bd4793757c8b..347ef8a72bd7 100644 --- a/pkgs/development/compilers/gcc-4.4/default.nix +++ b/pkgs/development/compilers/gcc-4.4/default.nix @@ -9,13 +9,15 @@ , bison ? null, flex ? null , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null +, libXtst ? null , enableMultilib ? false , name ? "gcc" }: assert langTreelang -> bison != null && flex != null; assert langJava -> zip != null && unzip != null; -assert gtk != null -> pkgconfig != null && libart_lgpl != null; +assert gtk != null -> pkgconfig != null && libart_lgpl != null + && libXtst != null; with stdenv.lib; @@ -71,7 +73,7 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optional (boehmgc != null) boehmgc) ++ (optionals langJava [zip unzip]) - ++ (optionals (gtk != null) [gtk pkgconfig libart_lgpl]) + ++ (optionals (gtk != null) [gtk pkgconfig libart_lgpl libXtst]) ; configureFlags = " |