diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/java')
5 files changed, 8 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix index 5009fe6cac7f..974f7bf9a1cc 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.11"; + version = "3.12.0"; pname = "commons-lang"; src = fetchurl { url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz"; - sha256 = "08w7zg9v48rlaq0n17dnph8jydz9srh1pl3ffs3xdfsg9a7axjm4"; + sha256 = "sha256-MwEkZd/Lf3kKyjM+CevxBeKl+5XCxjiz33kNPvqQjig="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix b/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix index 4d9902cbbe9a..0e5b1084b49c 100644 --- a/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { url = "https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip"; sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; - buildInputs = [ jdk unzip ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ jdk ]; buildPhase = '' cd source diff --git a/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix b/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix index 7a7d6a933bc0..0484f4c59ba6 100644 --- a/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ANT_ARGS = # Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib. (if stdenv.is64bit then [ "-Dskip32=true" ] else [ "-Dskip64=true" ]) - ++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ] + ++ [ "-Dgcc=${stdenv.cc.targetPrefix}cc" "-Dant.build.javac.source=1.6" ] ++ lib.optional stdenv.isDarwin "-DisMac=true"; installPhase = diff --git a/nixpkgs/pkgs/development/libraries/java/lombok/default.nix b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix index ddf95ead249a..5519a1fb7665 100644 --- a/nixpkgs/pkgs/development/libraries/java/lombok/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1msys7xkaj0d7fi112fmb2z50mk46db58agzrrdyimggsszwn1kj"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; outputs = [ "out" "bin" ]; diff --git a/nixpkgs/pkgs/development/libraries/java/rhino/default.nix b/nixpkgs/pkgs/development/libraries/java/rhino/default.nix index d34787d8b1f0..bc50f0206598 100644 --- a/nixpkgs/pkgs/development/libraries/java/rhino/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/rhino/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation { ln -sv "${xbeans}" "build/tmp-xbean/xbean.zip" ''; - buildInputs = [ unzip ant javac jvm ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ ant javac jvm ]; buildPhase = "ant jar"; doCheck = false; |