ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-06 21:42:35 +03:00
Code Issues Projects Releases Wiki Activity

More deps on xlibs

Browse Source 
svn path=/nixpkgs/trunk/; revision=8188
This commit is contained in:
Martin Bravenboer 2007-03-05 17:55:17 +00:00
parent 25e0bf0f49
commit 3b1d307518
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/jdk/jdk6-linux.nix
View File

@ -2,8 +2,7 @@
, stdenv , stdenv
, fetchurl , fetchurl
, unzip , unzip
, libX11 ? null , xlibs ? null
, libXext ? null
, installjdk ? true , installjdk ? true
}: }:
@ -11,7 +10,7 @@
* @todo Support x86_64-linux. * @todo Support x86_64-linux.
*/ */
assert stdenv.system == "i686-linux"; assert stdenv.system == "i686-linux";
assert swingSupport -> libX11 != null && libXext != null; assert swingSupport -> xlibs != null;
(stdenv.mkDerivation { (stdenv.mkDerivation {
name = name =
@ -35,7 +34,7 @@ assert swingSupport -> libX11 != null && libXext != null;
buildInputs = [unzip]; buildInputs = [unzip];
libraries = libraries =
(if swingSupport then [libX11 libXext] else []); (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi] else []);
} // { } // {
inherit swingSupport; inherit swingSupport;
} // { } // {

3
pkgs/top-level/all-packages.nix
View File

@ -743,8 +743,7 @@ rec {
"/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home" "/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home"
else else
import ../development/compilers/jdk { import ../development/compilers/jdk {
inherit fetchurl stdenv unzip installjdk; inherit fetchurl stdenv unzip installjdk xlibs;
inherit (xlibs) libX11 libXext;
}; };
jikes = import ../development/compilers/jikes { jikes = import ../development/compilers/jikes {