BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
, 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;
} // {

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

@ -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 {