diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-07-29 20:47:12 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-07-29 20:47:12 +0000 |
| commit | a2e9613540217d221370cc339f937d499b5d3a11 (patch) | |
| tree | 9719f0705cdba2a32c8ebf6c2a3d4c357e70ae3a /pkgs | |
| parent | 4456c7496aea944d788174d147d4c90f2d63c228 (diff) | |
| download | nixlib-a2e9613540217d221370cc339f937d499b5d3a11.tar nixlib-a2e9613540217d221370cc339f937d499b5d3a11.tar.gz nixlib-a2e9613540217d221370cc339f937d499b5d3a11.tar.bz2 nixlib-a2e9613540217d221370cc339f937d499b5d3a11.tar.lz nixlib-a2e9613540217d221370cc339f937d499b5d3a11.tar.xz nixlib-a2e9613540217d221370cc339f937d499b5d3a11.tar.zst nixlib-a2e9613540217d221370cc339f937d499b5d3a11.zip | |
GCJ 4.4: More X dependencies (soon it will be all over, well I hope soon).
svn path=/nixpkgs/trunk/; revision=16512
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 | 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 9dd78e13fc86..faa1d0183b7f 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 588a66f3d6d1..f2388cd37657 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; |