* Fix the JDK build on x86_64.
svn path=/nixpkgs/trunk/; revision=10871
This commit is contained in:
parent
843810c14f
commit
46e26d7a9b
@ -52,7 +52,7 @@ function mozillaExtraLibPath() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if test -z "$pluginSupport"; then
|
if test -z "$pluginSupport"; then
|
||||||
rm $out/bin/javaws
|
rm -f $out/bin/javaws
|
||||||
else
|
else
|
||||||
wrapProgram "$out/bin/javaws" \
|
wrapProgram "$out/bin/javaws" \
|
||||||
--suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)"
|
--suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)"
|
||||||
@ -61,4 +61,4 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Workaround for assertions in xlib, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6532373.
|
# Workaround for assertions in xlib, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6532373.
|
||||||
substituteInPlace $jrePath/lib/i386/xawt/libmawt.so --replace XINERAMA FAKEEXTN
|
substituteInPlace $jrePath/lib/*/xawt/libmawt.so --replace XINERAMA FAKEEXTN
|
||||||
|
Loading…
x
Reference in New Issue
Block a user