From 9f98b2bd7c6d53ee222649f578f20e6ee984bda1 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 5 Apr 2022 09:34:48 +0200 Subject: [PATCH] makeWrapper to nativeBuildInputs (#167225) --- pkgs/applications/graphics/imgbrd-grabber/default.nix | 2 +- pkgs/applications/graphics/jpegrescan/default.nix | 6 +++++- pkgs/applications/graphics/synfigstudio/default.nix | 4 ++-- pkgs/development/libraries/hivex/default.nix | 4 ++-- pkgs/development/tools/phantomjs2/default.nix | 3 +-- pkgs/os-specific/linux/pam_usb/default.nix | 6 +++++- pkgs/servers/monitoring/munin/default.nix | 5 ++++- pkgs/servers/owncast/default.nix | 2 +- pkgs/servers/rt/default.nix | 2 +- pkgs/tools/X11/obconf/default.nix | 2 +- pkgs/tools/misc/kisslicer/default.nix | 5 ++++- pkgs/tools/misc/logstash/6.x.nix | 6 +++++- pkgs/tools/misc/logstash/7.x.nix | 5 ++++- 13 files changed, 36 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index 59d1e6817bd..b9f838c016f 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -33,12 +33,12 @@ stdenv.mkDerivation rec { buildInputs = [ openssl - makeWrapper libpulseaudio typescript ]; nativeBuildInputs = [ + makeWrapper qtmultimedia qtbase qtdeclarative diff --git a/pkgs/applications/graphics/jpegrescan/default.nix b/pkgs/applications/graphics/jpegrescan/default.nix index 1a7320bf693..f96742e6c06 100644 --- a/pkgs/applications/graphics/jpegrescan/default.nix +++ b/pkgs/applications/graphics/jpegrescan/default.nix @@ -28,8 +28,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ perlPackages.FileSlurp ]; + nativeBuildInputs = [ + makeWrapper + ]; + buildInputs = [ - perl libjpeg_turbo makeWrapper + perl libjpeg_turbo ]; meta = with lib; { diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 2b9fee974b3..57f35602336 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -103,10 +103,10 @@ stdenv.mkDerivation { preConfigure = "./bootstrap.sh"; - nativeBuildInputs = [ pkg-config autoreconfHook gettext ]; + nativeBuildInputs = [ pkg-config autoreconfHook gettext makeWrapper ]; buildInputs = [ ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool - libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 + libjack2 libsigcxx libxmlxx mlt-qt5 synfig which gnome.adwaita-icon-theme ]; diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 204af0a92b5..85fa8fc4c6e 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { patches = [ ./hivex-syms.patch ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; buildInputs = [ - autoreconfHook makeWrapper libxml2 + libxml2 ] ++ (with perlPackages; [ perl IOStringy ]) ++ lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index d9e4ec1fb19..5093553824d 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -25,11 +25,10 @@ in stdenv.mkDerivation rec { sha256 = "1zsbpk1sgh9a16f1a5nx3qvk77ibjn812wqkxqck8n6fia85m5iq"; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake makeWrapper ]; buildInputs = [ bison flex fontconfig freetype gperf icu openssl libjpeg libpng perl python2 ruby sqlite qtwebkit qtbase - makeWrapper ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ApplicationServices AppKit Cocoa OpenGL darwin.libobjc fakeClang cups diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index 0091accd57a..ebd45246ae8 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -41,8 +41,12 @@ stdenv.mkDerivation rec { sha256 = "1g1w0s9d8mfld8abrn405ll5grv3xgs0b0hsganrz6qafdq9j7q1"; }; - buildInputs = [ + nativeBuildInputs = [ makeWrapper + pkg-config + ]; + + buildInputs = [ # pam_usb dependencies dbus libxml2 pam pmount pkg-config # pam_usb's tools dependencies diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 258247c34f4..e8fa4feb6af 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -13,8 +13,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-p273O5JLFX1dA2caV3lVVL9YNTcGMSrC7DWieUfUmqI="; }; - buildInputs = [ + nativeBuildInputs = [ makeWrapper + ]; + + buildInputs = [ which coreutils rrdtool diff --git a/pkgs/servers/owncast/default.nix b/pkgs/servers/owncast/default.nix index 774f51bc0f6..313d17e8e8d 100644 --- a/pkgs/servers/owncast/default.nix +++ b/pkgs/servers/owncast/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { propagatedBuildInputs = [ ffmpeg ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; preInstall = '' mkdir -p $out diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index ff0bbd6b97d..2b5188f743a 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook + makeWrapper ]; buildInputs = [ - makeWrapper perl (buildEnv { name = "rt-perl-deps"; diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index 8074e52c7cf..5ffef951d51 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook + makeWrapper pkg-config ]; @@ -22,7 +23,6 @@ stdenv.mkDerivation rec { libSM libstartup_notification libxml2 - makeWrapper openbox ]; diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index 31bc0b2b6a1..f80e15b3b3c 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -27,8 +27,11 @@ stdenv.mkDerivation rec { stripRoot = false; }; - buildInputs = [ + nativeBuildInputs = [ makeWrapper + ]; + + buildInputs = [ libGLU libGL libX11 ]; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 0b3e17818dc..c1136ed8876 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -26,8 +26,12 @@ let this = stdenv.mkDerivation rec { dontStrip = true; dontPatchShebangs = true; + nativeBuildInputs = [ + makeWrapper + ]; + buildInputs = [ - makeWrapper jre + jre ]; installPhase = '' diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 636c380817c..6cf64691efb 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -41,8 +41,11 @@ let dontStrip = true; dontPatchShebangs = true; - buildInputs = [ + nativeBuildInputs = [ makeWrapper + ]; + + buildInputs = [ jre ];