treewide: makeWrapper buildInputs to nativeBuildInputs

2021-02-19 20:09:16 +07:00
parent 06c2bba257
commit e03c068af5
332 changed files with 532 additions and 391 deletions
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
  pname = "ant";
  inherit version;

-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];

  src = fetchurl {
    url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
  pname = "ant";
  inherit version;

-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];

  src = fetchurl {
    url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
    sha256 = "1i9qlj3vy4j1yyf22nwisd0pg88n9qzp9ymfhwqabadka7br3b96";
  };

-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];

  inherit jdk;

@@ -33,7 +33,8 @@ rec {
        echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies
      '';

-    buildInputs = [ unzip java makeWrapper ];
+    nativeBuildInputs = [ makeWrapper ];
+    buildInputs = [ unzip java ];

    meta = {
      description = "Enterprise-grade build system";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

  dontUnpack = true;

-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
  propagatedBuildInputs = [ jdk ];

  # the jar is not in share/java, because it's a standalone jar and should
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
    sha256 = "0d3hz3vy5qmjr9r4f8a5cx9hikpzs8h8f0fsl3dpbialf4wck24g";
  };

-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];

  sourceRoot = ".";
  installPhase = ''
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

  dontBuild = true;

-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];

  installPhase = ''
    mkdir -p $out/bin