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
@@ -12,7 +12,7 @@ python2Packages.buildPythonApplication  rec {
    sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4";
  };

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

  checkInputs = [ subversion git breezy ];

@@ -15,7 +15,8 @@ in
      sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz";
    };

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

    phases = "installPhase";

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
    sha256 = "0hzyh66rlawxip4n2pvz7pbs0cq82clqv1d6c7hf60v1drjxw287";
  };

-  buildInputs = [mercurial.python mercurial makeWrapper];
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [mercurial.python mercurial];

  installPhase = ''
    binPath=$out/bin
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
    sha256 = "13m9y0m6gc3mlw3pqv9x4i0him2ycbysizigdvdanhh514kga602";
  };

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

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

  patchPhase = ''
    substituteInPlace commands.cpp \
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {

  installFlags = [ "prefix=$(out)" ];

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

  # perl provides shasum
  postInstall = ''
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "11n46bngvca5wbdbfcxzjhjbfdbad7sgf7h9gf956cb1q8swsdm0";
  };

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

  buildPhase = null;

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
    sha256 = "1g8i6vpjnnfh7vc1269c91bap267w4bxdqqwnzb8x18vqgn2fx8i";
  };

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

  buildPhase = null;

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "0v0yxydpw6r4awy0hb7sbnh520zsk86ibzh1xjf3983yhsvkfk5v";
  };

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

  dontBuild = true;

@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
    sha256 = "0hc7yavcp8jmn6b7wngjqhy8kl7f4191sfpik8ycvqghkvvimxj4";
  };

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

  installPhase = ''
    install -D git-secret $out/bin/git-secret
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
    sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz";
  };

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

  dontBuild = true;

@@ -67,10 +67,10 @@ stdenv.mkDerivation {
        --subst-var-by gettext ${gettext}
  '';

-  nativeBuildInputs = [ gettext perlPackages.perl ]
+  nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ]
    ++ lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x
         docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ];
-  buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv]
+  buildInputs = [curl openssl zlib expat cpio libiconv]
    ++ lib.optionals perlSupport [ perlPackages.perl ]
    ++ lib.optionals guiSupport [tcl tk]
    ++ lib.optionals withpcre2 [ pcre2 ]
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8=";
  };

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

  preBuild = ''
    makeFlagsArray+=(prefix="$out")
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
    sha256 = "0ly2vrv6q31n0xhciwb7a1ilr5c6ndyi3bg81yfp4axiypps7l41";
  };

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

  dontBuild = true;

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
    sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam";
  };

-  buildInputs = [ makeWrapper git openssl coreutils util-linux gnugrep gnused gawk ];
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ git openssl coreutils util-linux gnugrep gnused gawk ];

  patches = [ ./helper-scripts_depspathprefix.patch ];

@@ -21,7 +21,8 @@ in python2Packages.buildPythonApplication {

  inherit python; # pass it so that the same version can be used in hg2git

-  buildInputs = [ makeWrapper docutils unzip ]
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ docutils unzip ]
    ++ lib.optionals stdenv.isDarwin [ ApplicationServices ];

  propagatedBuildInputs = [ hg-git dulwich ];
@@ -19,7 +19,8 @@ in python3Packages.buildPythonApplication rec {

  passthru = { inherit python; }; # pass it so that the same version can be used in hg2git

-  buildInputs = [ makeWrapper docutils unzip ]
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ docutils unzip ]
    ++ lib.optionals stdenv.isDarwin [ ApplicationServices ];

  makeFlags = [ "PREFIX=$(out)" ];
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
  version = "1.0.2";
  pname = "monotone-viz";

-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4];
+  nativeBuildInputs = [ pkg-config makeWrapper ];
+  buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 camlp4];
  src = fetchurl {
    url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz";
    sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";