diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-07-29 19:33:45 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-07-29 19:33:45 +0000 |
| commit | 6e75b20d464626e47dff9192d5d534433ad8d5b0 (patch) | |
| tree | c009541387db20d50226724ffb25c68fde66b4c3 /pkgs | |
| parent | 14b71e6b1d900a8c4f3eb82a7f177bd8a956b549 (diff) | |
| download | nixlib-6e75b20d464626e47dff9192d5d534433ad8d5b0.tar nixlib-6e75b20d464626e47dff9192d5d534433ad8d5b0.tar.gz nixlib-6e75b20d464626e47dff9192d5d534433ad8d5b0.tar.bz2 nixlib-6e75b20d464626e47dff9192d5d534433ad8d5b0.tar.lz nixlib-6e75b20d464626e47dff9192d5d534433ad8d5b0.tar.xz nixlib-6e75b20d464626e47dff9192d5d534433ad8d5b0.tar.zst nixlib-6e75b20d464626e47dff9192d5d534433ad8d5b0.zip | |
GCJ 4.4: More X dependencies (it's never enough).
svn path=/nixpkgs/trunk/; revision=16510
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/gcc-4.4/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 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 d68f6c19cace..9dd78e13fc86 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, renderproto ? null +, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , enableMultilib ? false , name ? "gcc" }: @@ -33,6 +33,7 @@ let version = "4.4.1"; xlibs = [ libX11 libXt libSM libICE libXtst libXrender xproto renderproto + xextproto ]; javaAwtGtk = langJava && gtk != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4d4a9a10cde..588a66f3d6d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1736,7 +1736,8 @@ let inherit zip unzip zlib boehmgc gettext pkgconfig; inherit (gtkLibs) gtk; inherit (gnome) libart_lgpl; - inherit (xlibs) libX11 libXt libSM libICE libXtst libXrender xproto renderproto; + inherit (xlibs) libX11 libXt libSM libICE libXtst libXrender + xproto renderproto xextproto; }); #ghc = haskellPackages.ghc; |