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

rhino: remove dependency on GCJ (#29759)

This commit is contained in:
berdario 2017-09-26 10:58:20 +01:00 committed by Jörg Thalheim
parent dd6591c506
commit 472bb9681d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/java/rhino/default.nix
View File

@ -2,7 +2,6 @@
let let
version = "1.7R2"; version = "1.7R2";
options = "-Dbuild.compiler=gcj"; # FIXME: We assume GCJ here.
xbeans = fetchurl { xbeans = fetchurl {
url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"; url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip";
@ -33,7 +32,7 @@ stdenv.mkDerivation {
buildInputs = [ unzip ant javac jvm ]; buildInputs = [ unzip ant javac jvm ];
buildPhase = "ant ${options} jar"; buildPhase = "ant jar";
doCheck = false; doCheck = false;
# FIXME: Install javadoc as well. # FIXME: Install javadoc as well.

4
pkgs/top-level/all-packages.nix
View File

@ -10383,8 +10383,8 @@ with pkgs;
resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { };
rhino = callPackage ../development/libraries/java/rhino { rhino = callPackage ../development/libraries/java/rhino {
javac = gcj; javac = jdk;
jvm = gcj; jvm = jre;
}; };
rlog = callPackage ../development/libraries/rlog { }; rlog = callPackage ../development/libraries/rlog { };