diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-26 15:24:33 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-26 15:24:33 +0000 |
commit | 65dcf5ffa444fbed986abf759114cf6537008917 (patch) | |
tree | 52d2cb3c1b7959c0e77a27088f26cb8a59290072 | |
parent | 2763f4d08c01a6cbd6d262a52c1a73d9c9fda279 (diff) |
* Fix jre, and some cleanups.
svn path=/nixpkgs/trunk/; revision=10863
-rw-r--r-- | pkgs/development/compilers/jdk/dlj-bundle-builder.sh | 16 | ||||
-rw-r--r-- | pkgs/development/compilers/jdk/jdk6-linux.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/findbugs/default.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh index 74772222b19e7..5a3c8bf7f2ea6 100644 --- a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh +++ b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh @@ -32,11 +32,13 @@ for i in $libraries; do done if test -z "$installjdk"; then - rpath=$rpath${rpath:+:}$out/lib/$architecture/jli + jrePath=$out else - rpath=$rpath${rpath:+:}$out/jre/lib/$architecture/jli + jrePath=$out/jre fi +rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli + # set all the dynamic linkers find $out -type f -perm +100 \ -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ @@ -52,15 +54,11 @@ function mozillaExtraLibPath() { if test -z "$pluginSupport"; then rm $out/bin/javaws else - source $makeWrapper - - mv $out/bin/javaws $out/bin/javaws.bin - makeWrapper "$out/bin/javaws.bin" "$out/bin/javaws" \ + wrapProgram "$out/bin/javaws" \ --suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)" - mozillaExtraLibPath "$out/jre/plugin/i386/ns7" - mozillaExtraLibPath "$out/plugin/i386/ns7" + mozillaExtraLibPath "$jrePath/plugin/i386/ns7" fi # 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 diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix index 0c285c4526e69..14e0005e38c4b 100644 --- a/pkgs/development/compilers/jdk/jdk6-linux.nix +++ b/pkgs/development/compilers/jdk/jdk6-linux.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , unzip +, makeWrapper , xlibs ? null , installjdk ? true , pluginSupport ? true @@ -51,7 +52,7 @@ assert pluginSupport -> libstdcpp5 != null; else abort "jdk requires i686-linux or x86_64 linux"; - buildInputs = [unzip]; + buildInputs = [unzip makeWrapper]; libraries = (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 if pluginSupport then { - makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh; libPath = [libstdcpp5]; inherit libstdcpp5; } diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index 2c14d2c832949..cf4f87f528e12 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -17,4 +17,9 @@ stdenv.mkDerivation { cp -prd bin lib plugin doc $out/ rm $out/bin/*.bat ''; + + meta = { + description = "A static analysis tool to find bugs in Java programs automatically"; + homepage = http://findbugs.sourceforge.net/; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d07f39208c48..2732e2b84e7bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1471,7 +1471,7 @@ rec { jdkdistro = installjdk: pluginSupport: assert supportsJDK; (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; }); |