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

* Fix jre, and some cleanups.

Browse Source 
svn path=/nixpkgs/trunk/; revision=10863
This commit is contained in:
Eelco Dolstra
2008-02-26 15:24:33 +00:00
parent 2763f4d08c
commit 65dcf5ffa4
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/jdk/dlj-bundle-builder.sh
+7 -9
View File
@@ -32,11 +32,13 @@ for i in $libraries; do
done done
if test -z "$installjdk"; then if test -z "$installjdk"; then
rpath=$rpath${rpath:+:}$out/lib/$architecture/jli jrePath=$out
else else
rpath=$rpath${rpath:+:}$out/jre/lib/$architecture/jli jrePath=$out/jre
fi fi
rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli
# set all the dynamic linkers # set all the dynamic linkers
find $out -type f -perm +100 \ find $out -type f -perm +100 \
-exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
@@ -52,15 +54,11 @@ function mozillaExtraLibPath() {
if test -z "$pluginSupport"; then if test -z "$pluginSupport"; then
rm $out/bin/javaws rm $out/bin/javaws
else else
source $makeWrapper wrapProgram "$out/bin/javaws" \
mv $out/bin/javaws $out/bin/javaws.bin
makeWrapper "$out/bin/javaws.bin" "$out/bin/javaws" \
--suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)" --suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)"
mozillaExtraLibPath "$out/jre/plugin/i386/ns7" mozillaExtraLibPath "$jrePath/plugin/i386/ns7"
mozillaExtraLibPath "$out/plugin/i386/ns7"
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 $out/jre/lib/i386/xawt/libmawt.so --replace XINERAMA FAKEEXTN substituteInPlace $jrePath/lib/i386/xawt/libmawt.so --replace XINERAMA FAKEEXTN
pkgs/development/compilers/jdk/jdk6-linux.nix
+2 -2
View File
@@ -2,6 +2,7 @@
, stdenv , stdenv
, fetchurl , fetchurl
, unzip , unzip
, makeWrapper
, xlibs ? null , xlibs ? null
, installjdk ? true , installjdk ? true
, pluginSupport ? true , pluginSupport ? true
@@ -51,7 +52,7 @@ assert pluginSupport -> libstdcpp5 != null;
else else
abort "jdk requires i686-linux or x86_64 linux"; abort "jdk requires i686-linux or x86_64 linux";
buildInputs = [unzip]; buildInputs = [unzip makeWrapper];
libraries = libraries =
(if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi] else []); (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi] else []);
@@ -60,7 +61,6 @@ assert pluginSupport -> libstdcpp5 != null;
# necessary for javaws and mozilla plugin # necessary for javaws and mozilla plugin
if pluginSupport then if pluginSupport then
{ {
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
libPath = [libstdcpp5]; libPath = [libstdcpp5];
inherit libstdcpp5; inherit libstdcpp5;
} }
pkgs/development/tools/analysis/findbugs/default.nix
+5
View File
@@ -17,4 +17,9 @@ stdenv.mkDerivation {
cp -prd bin lib plugin doc $out/ cp -prd bin lib plugin doc $out/
rm $out/bin/*.bat rm $out/bin/*.bat
''; '';
meta = {
description = "A static analysis tool to find bugs in Java programs automatically";
homepage = http://findbugs.sourceforge.net/;
};
} }
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -1471,7 +1471,7 @@ rec {
jdkdistro = installjdk: pluginSupport: jdkdistro = installjdk: pluginSupport:
assert supportsJDK; assert supportsJDK;
(if pluginSupport then appendToName "plugin" else x: x) (import ../development/compilers/jdk { (if pluginSupport then appendToName "plugin" else x: x) (import ../development/compilers/jdk {
inherit fetchurl stdenv unzip installjdk xlibs pluginSupport; inherit fetchurl stdenv unzip installjdk xlibs pluginSupport makeWrapper;
libstdcpp5 = gcc33.gcc; libstdcpp5 = gcc33.gcc;
}); });