jdk-without-plugin fix
svn path=/nixpkgs/trunk/; revision=8460
This commit is contained in:
parent
a9c0d60adb
commit
753eae47d1
@ -1,5 +1,4 @@
|
|||||||
source $stdenv/setup
|
source $stdenv/setup
|
||||||
source $makeWrapper
|
|
||||||
|
|
||||||
echo "Unpacking distribution"
|
echo "Unpacking distribution"
|
||||||
unzip ${src} || true
|
unzip ${src} || true
|
||||||
@ -53,6 +52,8 @@ function mozillaExtraLibPath() {
|
|||||||
if test -z "$pluginSupport"; then
|
if test -z "$pluginSupport"; then
|
||||||
rm $out/bin/javaws
|
rm $out/bin/javaws
|
||||||
else
|
else
|
||||||
|
source $makeWrapper
|
||||||
|
|
||||||
mv $out/bin/javaws $out/bin/javaws.bin
|
mv $out/bin/javaws $out/bin/javaws.bin
|
||||||
makeWrapper "$out/bin/javaws.bin" "$out/bin/javaws" \
|
makeWrapper "$out/bin/javaws.bin" "$out/bin/javaws" \
|
||||||
--suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)"
|
--suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)"
|
||||||
|
Loading…
Reference in New Issue
Block a user