diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-28 12:32:57 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-28 12:32:57 -0400 |
| commit | f037625f87b0b1d8852a1f31ebaece5fdbc87a2b (patch) | |
| tree | af8c8369954890db69195a1e9394ce16c7640d7f /pkgs/development/libraries/java | |
| parent | f08d6f0e2daf9f3d9daa070eee223855b33c430d (diff) | |
| parent | 4e22e88b914ffb63393449c5e20fe8843a7ce93b (diff) | |
| download | nixpkgs-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar nixpkgs-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.gz nixpkgs-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.bz2 nixpkgs-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.lz nixpkgs-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.xz nixpkgs-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.zst nixpkgs-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.zip | |
Merge remote-tracking branch 'upstream/staging' into deps-reorg
Diffstat (limited to 'pkgs/development/libraries/java')
| -rw-r--r-- | pkgs/development/libraries/java/rhino/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index f106bbe6ebc..c3e80fe87f4 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. |