diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2007-03-05 17:55:17 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2007-03-05 17:55:17 +0000 |
| commit | 3b1d307518a9c36a77f1f18ed8ed0b1c2bfac91a (patch) | |
| tree | 007cb86b62062e36b48ecf8715a2fe9ba7f9cdb7 /pkgs | |
| parent | 25e0bf0f4994034f846be62caefaa762037ce95d (diff) | |
| download | nixlib-3b1d307518a9c36a77f1f18ed8ed0b1c2bfac91a.tar nixlib-3b1d307518a9c36a77f1f18ed8ed0b1c2bfac91a.tar.gz nixlib-3b1d307518a9c36a77f1f18ed8ed0b1c2bfac91a.tar.bz2 nixlib-3b1d307518a9c36a77f1f18ed8ed0b1c2bfac91a.tar.lz nixlib-3b1d307518a9c36a77f1f18ed8ed0b1c2bfac91a.tar.xz nixlib-3b1d307518a9c36a77f1f18ed8ed0b1c2bfac91a.tar.zst nixlib-3b1d307518a9c36a77f1f18ed8ed0b1c2bfac91a.zip | |
More deps on xlibs
svn path=/nixpkgs/trunk/; revision=8188
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/jdk/jdk6-linux.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix index 78ea373cf04f..df8eedcf11bc 100644 --- a/pkgs/development/compilers/jdk/jdk6-linux.nix +++ b/pkgs/development/compilers/jdk/jdk6-linux.nix @@ -2,8 +2,7 @@ , stdenv , fetchurl , unzip -, libX11 ? null -, libXext ? null +, xlibs ? null , installjdk ? true }: @@ -11,7 +10,7 @@ * @todo Support x86_64-linux. */ assert stdenv.system == "i686-linux"; -assert swingSupport -> libX11 != null && libXext != null; +assert swingSupport -> xlibs != null; (stdenv.mkDerivation { name = @@ -35,7 +34,7 @@ assert swingSupport -> libX11 != null && libXext != null; buildInputs = [unzip]; libraries = - (if swingSupport then [libX11 libXext] else []); + (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi] else []); } // { inherit swingSupport; } // { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9b19a1e253c..c8a7657cf658 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -743,8 +743,7 @@ rec { "/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home" else import ../development/compilers/jdk { - inherit fetchurl stdenv unzip installjdk; - inherit (xlibs) libX11 libXext; + inherit fetchurl stdenv unzip installjdk xlibs; }; jikes = import ../development/compilers/jikes { |