diff options
| -rw-r--r-- | pkgs/development/libraries/java/rhino/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index f106bbe6ebca..c3e80fe87f48 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -2,7 +2,6 @@ let version = "1.7R2"; - options = "-Dbuild.compiler=gcj"; # FIXME: We assume GCJ here. xbeans = fetchurl { url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"; @@ -33,7 +32,7 @@ stdenv.mkDerivation { buildInputs = [ unzip ant javac jvm ]; - buildPhase = "ant ${options} jar"; + buildPhase = "ant jar"; doCheck = false; # FIXME: Install javadoc as well. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b656248c3f0..47f84558e3f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10383,8 +10383,8 @@ with pkgs; resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { - javac = gcj; - jvm = gcj; + javac = jdk; + jvm = jre; }; rlog = callPackage ../development/libraries/rlog { }; |