From a2e9613540217d221370cc339f937d499b5d3a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 29 Jul 2009 20:47:12 +0000 Subject: [PATCH] GCJ 4.4: More X dependencies (soon it will be all over, well I hope soon). svn path=/nixpkgs/trunk/; revision=16512 --- pkgs/development/compilers/gcc-4.4/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index 9dd78e13fc8..faa1d0183b7 100644 --- a/pkgs/development/compilers/gcc-4.4/default.nix +++ b/pkgs/development/compilers/gcc-4.4/default.nix @@ -11,6 +11,7 @@ , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null +, inputproto ? null , enableMultilib ? false , name ? "gcc" }: @@ -33,7 +34,7 @@ let version = "4.4.1"; xlibs = [ libX11 libXt libSM libICE libXtst libXrender xproto renderproto - xextproto + xextproto inputproto ]; javaAwtGtk = langJava && gtk != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 588a66f3d6d..f2388cd3765 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1737,7 +1737,7 @@ let inherit (gtkLibs) gtk; inherit (gnome) libart_lgpl; inherit (xlibs) libX11 libXt libSM libICE libXtst libXrender - xproto renderproto xextproto; + xproto renderproto xextproto inputproto; }); #ghc = haskellPackages.ghc;