From 211fdaa087a98b0eb3b2ba04ab22d3eca555a89b Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 14 Aug 2022 06:41:33 +0300 Subject: [PATCH] treewide: bundlerApp makeWrapper buildInputs -> nativeBuildInputs the docs for bundlerApp used to have makeWrapper in buildInputs but it has been corrected already --- pkgs/applications/graphics/image_optim/default.nix | 2 +- pkgs/applications/misc/gollum/default.nix | 2 +- pkgs/applications/misc/jekyll/default.nix | 2 +- pkgs/tools/admin/puppet/puppet-bolt/default.nix | 2 +- pkgs/tools/inputmethods/fusuma/default.nix | 2 +- pkgs/tools/security/wpscan/default.nix | 4 +--- pkgs/tools/system/r10k/default.nix | 2 +- .../tools/typesetting/asciidoctor-with-extensions/default.nix | 2 +- pkgs/tools/typesetting/kramdown-asciidoc/default.nix | 2 +- 9 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/graphics/image_optim/default.nix b/pkgs/applications/graphics/image_optim/default.nix index fd7ff0216242..a7ae37dbc0c4 100644 --- a/pkgs/applications/graphics/image_optim/default.nix +++ b/pkgs/applications/graphics/image_optim/default.nix @@ -35,7 +35,7 @@ bundlerApp { exes = [ "image_optim" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/image_optim \ diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index ebd8f0a175a8..3f77b890455b 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -7,7 +7,7 @@ bundlerApp rec { inherit ruby; gemdir = ./.; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; passthru.updateScript = bundlerUpdateScript "gollum"; diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 8c25e3774b14..7ea488659f26 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -30,7 +30,7 @@ in bundlerApp { then ./full else ./basic; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/jekyll --prefix PATH : ${rubyWrapper}/bin diff --git a/pkgs/tools/admin/puppet/puppet-bolt/default.nix b/pkgs/tools/admin/puppet/puppet-bolt/default.nix index 7752ddb2808d..cf6ffb6fb893 100644 --- a/pkgs/tools/admin/puppet/puppet-bolt/default.nix +++ b/pkgs/tools/admin/puppet/puppet-bolt/default.nix @@ -5,7 +5,7 @@ bundlerApp { gemdir = ./.; exes = [ "bolt" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; gemConfig.bolt = attrs: { # scripts in libexec will be executed by remote host, diff --git a/pkgs/tools/inputmethods/fusuma/default.nix b/pkgs/tools/inputmethods/fusuma/default.nix index dc6d3a09bfa4..7ed5bc99f46b 100644 --- a/pkgs/tools/inputmethods/fusuma/default.nix +++ b/pkgs/tools/inputmethods/fusuma/default.nix @@ -5,7 +5,7 @@ bundlerApp { gemdir = ./.; exes = [ "fusuma" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram "$out/bin/fusuma" \ diff --git a/pkgs/tools/security/wpscan/default.nix b/pkgs/tools/security/wpscan/default.nix index 965c48b304fe..4b3757ae7673 100644 --- a/pkgs/tools/security/wpscan/default.nix +++ b/pkgs/tools/security/wpscan/default.nix @@ -9,9 +9,7 @@ bundlerApp { gemdir = ./.; exes = [ "wpscan" ]; - buildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram "$out/bin/wpscan" \ diff --git a/pkgs/tools/system/r10k/default.nix b/pkgs/tools/system/r10k/default.nix index 43d67eddf7db..12522bd8cff1 100644 --- a/pkgs/tools/system/r10k/default.nix +++ b/pkgs/tools/system/r10k/default.nix @@ -5,7 +5,7 @@ bundlerApp { gemdir = ./.; exes = [ "r10k" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]} diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix b/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix index e31ce69baa1f..50ee906262ee 100644 --- a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix +++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix @@ -20,7 +20,7 @@ bundlerApp rec { "asciidoctor-revealjs" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = lib.optionalString (path != "") (lib.concatMapStrings (exe: '' wrapProgram $out/bin/${exe} \ diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix index aa1d68e708af..ebe57e3695f5 100644 --- a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix +++ b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix @@ -13,7 +13,7 @@ let "kramdoc" ]; - # buildInputs = [ makeWrapper ]; + # nativeBuildInputs = [ makeWrapper ]; # postBuild = '' # wrapProgram "$out/bin/asciidoctor-epub3" \