public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtualbox: Drop accidental JDK dependency

Browse Source
This commit is contained in:
Eelco Dolstra 2012-08-22 15:55:46 -04:00
parent ac73fc486c
commit 964880ec8f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -36,7 +36,7 @@ in stdenv.mkDerivation {
buildInputs = buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk libcap glib kernel python alsaLib curl pam xorriso makeself perl
pkgconfig which libXmu ] pkgconfig which libXmu ]
++ optional javaBindings jdk ++ optional javaBindings jdk
++ optional pythonBindings python; ++ optional pythonBindings python;
@ -70,7 +70,9 @@ in stdenv.mkDerivation {
cat >> AutoConfig.kmk << END_PATHS cat >> AutoConfig.kmk << END_PATHS
VBOX_PATH_APP_PRIVATE := $out VBOX_PATH_APP_PRIVATE := $out
VBOX_PATH_APP_DOCS := $out/doc VBOX_PATH_APP_DOCS := $out/doc
VBOX_JAVA_HOME := ${jdk} ${optionalString javaBindings ''
VBOX_JAVA_HOME := ${jdk}
''}
END_PATHS END_PATHS
echo "VBOX_WITH_DOCS :=" >> LocalConfig.kmk echo "VBOX_WITH_DOCS :=" >> LocalConfig.kmk
echo "VBOX_WITH_WARNINGS_AS_ERRORS :=" >> LocalConfig.kmk echo "VBOX_WITH_WARNINGS_AS_ERRORS :=" >> LocalConfig.kmk