From cf229e415617159a3015d50eed59be3c3398d4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 29 Jul 2009 16:18:31 +0000 Subject: [PATCH] GCJ 4.4: More X dependencies. svn path=/nixpkgs/trunk/; revision=16503 --- pkgs/development/compilers/gcc-4.4/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index e632982a434..d68f6c19cac 100644 --- a/pkgs/development/compilers/gcc-4.4/default.nix +++ b/pkgs/development/compilers/gcc-4.4/default.nix @@ -10,7 +10,7 @@ , zlib ? null, boehmgc ? null , 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 +, libXrender ? null, xproto ? null, renderproto ? null , enableMultilib ? false , name ? "gcc" }: @@ -30,7 +30,11 @@ let version = "4.4.1"; url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; }; - xlibs = [ libX11 libXt libSM libICE libXtst libXrender xproto ]; + + xlibs = [ + libX11 libXt libSM libICE libXtst libXrender xproto renderproto + ]; + javaAwtGtk = langJava && gtk != null; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6451a0bbb2d..c01a4b11a8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1736,7 +1736,7 @@ let inherit zip unzip zlib boehmgc gettext pkgconfig; inherit (gtkLibs) gtk; inherit (gnome) libart_lgpl; - inherit (xlibs) libX11 libXt libSM libICE libXtst libXrender xproto; + inherit (xlibs) libX11 libXt libSM libICE libXtst libXrender xproto renderproto; }); #ghc = haskellPackages.ghc;