diff options
| -rw-r--r-- | pkgs/development/compilers/gcc-4.4/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 5 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 = " diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa3aa2a89cd4..a1e7af99753f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1736,6 +1736,7 @@ let inherit zip unzip zlib boehmgc gettext pkgconfig; inherit (gtkLibs) gtk; inherit (gnome) libart_lgpl; + inherit (xlibs) libXtst; }); #ghc = haskellPackages.ghc; |