Commit 11bd5c27 authored by Dmitry Blinov's avatar Dmitry Blinov Committed by Esteban Blanc

fix jdk install

parent c1f2d6e0
...@@ -386,7 +386,7 @@ make-targets = ...@@ -386,7 +386,7 @@ make-targets =
make-options = make-options =
-j1 -j1
environment = environment =
PATH=${qt4-qmake:location}/bin:${make-4:location}/bin:${gcc:location}/bin:${doxygen:location}/bin:${pkgconfig:location}/bin:${java-jdk:location}/bin:${gtk-2:location}/bin:${bison:location}/bin:%(PATH)s PATH=${qt4-qmake:location}/bin:${make-4:location}/bin:${gcc:location}/bin:${doxygen:location}/bin:${pkgconfig:location}/bin:${java-jdk:files}/bin:${gtk-2:location}/bin:${bison:location}/bin:%(PATH)s
SHELL=/bin/bash SHELL=/bin/bash
PKG_CONFIG_PATH=${qt4-qmake:location}/lib/pkgconfig:${gtk-2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${fribidi:location}/lib/pkgconfig:${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${phonon-qt4:location}/lib/pkgconfig:${alsa:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig PKG_CONFIG_PATH=${qt4-qmake:location}/lib/pkgconfig:${gtk-2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${fribidi:location}/lib/pkgconfig:${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${phonon-qt4:location}/lib/pkgconfig:${alsa:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
LD_LIBRARY_PATH=${:ld-library-path} LD_LIBRARY_PATH=${:ld-library-path}
......
...@@ -42,7 +42,7 @@ extra-context = ...@@ -42,7 +42,7 @@ extra-context =
raw websockify_executable_location ${buildout:directory}/bin/websockify raw websockify_executable_location ${buildout:directory}/bin/websockify
raw xorg_font_util ${xorg-font-util:location} raw xorg_font_util ${xorg-font-util:location}
raw xvfb_bin ${xserver:location}/bin/Xvfb raw xvfb_bin ${xserver:location}/bin/Xvfb
raw java_location ${java-jdk:location} raw java_location ${java-jdk:files}
raw proview_directory ${pwr:location} raw proview_directory ${pwr:location}
raw proview_compile_dir ${pwr:compile-dir} raw proview_compile_dir ${pwr:compile-dir}
raw ld_library_path ${pwr:ld-library-path} raw ld_library_path ${pwr:ld-library-path}
......
...@@ -56,7 +56,7 @@ recipe = slapos.recipe.template ...@@ -56,7 +56,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
md5sum = 04aa7533e8468182a1a76086810e1e99 md5sum = 66ce630a6cdb37854a3ef6e0af8a8870
[download-base] [download-base]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment