tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

rhino: remove dependency on GCJ (#29759)

authored by

berdario and committed by
Jörg Thalheim 472bb968 dd6591c5

+3 -4
unified split
+1 -2
pkgs/development/libraries/java/rhino/default.nix
··· 2 3 let 4 version = "1.7R2"; 5 - options = "-Dbuild.compiler=gcj"; # FIXME: We assume GCJ here. 6 7 xbeans = fetchurl { 8 url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"; ··· 33 34 buildInputs = [ unzip ant javac jvm ]; 35 36 - buildPhase = "ant ${options} jar"; 37 doCheck = false; 38 39 # FIXME: Install javadoc as well.
··· 2 3 let 4 version = "1.7R2"; 5 6 xbeans = fetchurl { 7 url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"; ··· 32 33 buildInputs = [ unzip ant javac jvm ]; 34 35 + buildPhase = "ant jar"; 36 doCheck = false; 37 38 # FIXME: Install javadoc as well.
+2 -2
pkgs/top-level/all-packages.nix
··· 10383 resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; 10384 10385 rhino = callPackage ../development/libraries/java/rhino { 10386 - javac = gcj; 10387 - jvm = gcj; 10388 }; 10389 10390 rlog = callPackage ../development/libraries/rlog { };
··· 10383 resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; 10384 10385 rhino = callPackage ../development/libraries/java/rhino { 10386 + javac = jdk; 10387 + jvm = jre; 10388 }; 10389 10390 rlog = callPackage ../development/libraries/rlog { };