diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-20 21:01:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-20 16:01:53 -0500 |
| commit | 127733211e03cb0763246a2ebc0c99e2a438a6ce (patch) | |
| tree | aa9601b7da78a16d08e713e4d5e01ffe39dfd8b2 /pkgs/development/libraries/java | |
| parent | ce5052e93174070b3648e02bd3c787668331e9b5 (diff) | |
| download | nixpkgs-127733211e03cb0763246a2ebc0c99e2a438a6ce.tar nixpkgs-127733211e03cb0763246a2ebc0c99e2a438a6ce.tar.gz nixpkgs-127733211e03cb0763246a2ebc0c99e2a438a6ce.tar.bz2 nixpkgs-127733211e03cb0763246a2ebc0c99e2a438a6ce.tar.lz nixpkgs-127733211e03cb0763246a2ebc0c99e2a438a6ce.tar.xz nixpkgs-127733211e03cb0763246a2ebc0c99e2a438a6ce.tar.zst nixpkgs-127733211e03cb0763246a2ebc0c99e2a438a6ce.zip | |
treewide: unzip buildInputs to nativeBuildInputs (#112302)
Diffstat (limited to 'pkgs/development/libraries/java')
| -rw-r--r-- | pkgs/development/libraries/java/geoipjava/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/java/rhino/default.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index 4d9902cbbe9..0e5b1084b49 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/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/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index d34787d8b1f..bc50f020659 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/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; |