diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-27 11:27:22 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-27 11:27:22 +0000 |
| commit | 46e26d7a9b313b9b60e39ab915c1926eecec01ba (patch) | |
| tree | 481703915b4f42fb290384feae784682eb01e856 /pkgs/development/compilers | |
| parent | 843810c14f90029b15060353ae55faab9c57bbd7 (diff) | |
| download | nixpkgs-46e26d7a9b313b9b60e39ab915c1926eecec01ba.tar nixpkgs-46e26d7a9b313b9b60e39ab915c1926eecec01ba.tar.gz nixpkgs-46e26d7a9b313b9b60e39ab915c1926eecec01ba.tar.bz2 nixpkgs-46e26d7a9b313b9b60e39ab915c1926eecec01ba.tar.lz nixpkgs-46e26d7a9b313b9b60e39ab915c1926eecec01ba.tar.xz nixpkgs-46e26d7a9b313b9b60e39ab915c1926eecec01ba.tar.zst nixpkgs-46e26d7a9b313b9b60e39ab915c1926eecec01ba.zip | |
* Fix the JDK build on x86_64.
svn path=/nixpkgs/trunk/; revision=10871
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/jdk/dlj-bundle-builder.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh index 5a3c8bf7f2e..e990eaf5392 100644 --- a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh +++ b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh @@ -52,7 +52,7 @@ function mozillaExtraLibPath() { } if test -z "$pluginSupport"; then - rm $out/bin/javaws + rm -f $out/bin/javaws else wrapProgram "$out/bin/javaws" \ --suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)" @@ -61,4 +61,4 @@ else fi # 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 |