diff options
Diffstat (limited to 'pkgs')
129 files changed, 235 insertions, 192 deletions
diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index 2603e88fcbd..e3e1ec74ffd 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -28,8 +28,9 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gettext ncurses ] - ++ lib.optionals gtkGUI [ pkg-config gtk2 ]; + ++ lib.optionals gtkGUI [ gtk2 ]; meta = with lib; { description = "Audio mixer for X and the console"; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index bdcbf024e60..4ab651e3fb8 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH - libglade lv2 pkg-config + libglade lv2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 30c6e57188a..954a2265312 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ pkg-config fftwFloat alsa-lib zlib wavpack wxGTK31 udev ] + buildInputs = [ fftwFloat alsa-lib zlib wavpack wxGTK31 udev ] ++ lib.optional jackaudioSupport libjack2; cmakeFlags = lib.optional (!jackaudioSupport) [ diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/pkgs/applications/audio/ltc-tools/default.nix index c8c87959727..93558105074 100644 --- a/pkgs/applications/audio/ltc-tools/default.nix +++ b/pkgs/applications/audio/ltc-tools/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al"; }; - buildInputs = [ pkg-config libltc libsndfile jack2 ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libltc libsndfile jack2 ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index a825eaa4e38..675189f6d13 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch]; + nativeBuildInputs = [ pkg-config ]; buildInputs = - [ pkg-config SDL SDL_image libjack2 + [ SDL SDL_image libjack2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix b/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix index 3896545dc41..a628e38469f 100644 --- a/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix +++ b/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-1KiWMTVTTf1/iR4AzJ1Oe0mOrWN5edsZN0tQMidgnRA="; }; - buildInputs = [ lv2 pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ lv2 ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index a8a5bed0e07..99bbdf693a9 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib boost @@ -33,7 +34,6 @@ stdenv.mkDerivation rec { glibmm gtkmm2 libjack2 - pkg-config python3 wafHook ]; diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index 112d84a08b1..da149db0753 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo - libdvdread pkg-config x264 libmpeg2 xvidcore ]; + libdvdread x264 libmpeg2 xvidcore ]; configureFlags = [ "--disable-ffmpeg" "--disable-libavcodec" "--disable-libavformat" "--enable-lzo" "--enable-ogg" "--enable-vorbis" "--enable-theora" "--enable-libxml2" diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 61d49d110a9..87305027e4c 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; }; - nativeBuildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ alsa-lib dssi gtk2 libjack2 ladspaH - ladspaPlugins liblo pkg-config ]; + ladspaPlugins liblo ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index 2f53df97d32..0376e3af6bf 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool gtk2 ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix index d5961f0c9eb..9eba40330b9 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix @@ -45,7 +45,8 @@ let inherit (stdenv.hostPlatform) system; }).nodeDependencies.override (old: { inherit src version; - buildInputs = [pkg-config libsecret]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [libsecret]; dontNpmInstall = true; })); diff --git a/pkgs/applications/file-managers/spacefm/default.nix b/pkgs/applications/file-managers/spacefm/default.nix index 433109cd86a..334228f98ea 100644 --- a/pkgs/applications/file-managers/spacefm/default.nix +++ b/pkgs/applications/file-managers/spacefm/default.nix @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ - gtk3 udev desktop-file-utils shared-mime-info intltool + gtk3 udev desktop-file-utils shared-mime-info wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 ] ++ (if ifuseSupport then [ ifuse ] else []); # Introduced because ifuse doesn't build due to CVEs in libplist diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index d59b936608c..c861c695598 100644 --- a/pkgs/applications/file-managers/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fox gettext xlibsWrapper gcc intltool file libpng ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ fox gettext xlibsWrapper gcc file libpng ]; preConfigure = '' sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index ae1e64297bd..06c3b03ae53 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ intltool gtk2 ]; + buildInputs = [ gtk2 ]; meta = with lib; { description = "A simple and fast image viewer for X"; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index a77a0313223..c87a71fdf6c 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -114,7 +114,6 @@ stdenv.mkDerivation { gtk3 gtkmm3 imagemagick - intltool libjack2 libsigcxx libxmlxx diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 15c2d468fb4..2ba96fda3f0 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + nativeBuildInputs = [ intltool ]; buildInputs = [ aalib gsl libpng libX11 xorgproto libXext - libXt zlib gettext intltool perl + libXt zlib gettext perl ]; preConfigure = '' diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index 851f2d80c97..d5aa1ac8817 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { "--enable-SIGCHLD-fallback" ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ Xaw3d ghostscriptX perl - pkg-config ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index f7c5714f126..fb172eb22b0 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool gtk3 texinfo ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk3 texinfo ]; meta = { description = "A GTK enabled dropin replacement for xmessage"; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index dffbd2079ae..2e75791e308 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc"; }; - nativeBuildInputs = [ pkg-config automake autoconf ]; - buildInputs = [ gtk2 libXft intltool libtool ]; + nativeBuildInputs = [ pkg-config automake autoconf intltool ]; + buildInputs = [ gtk2 libXft libtool ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 536d800001b..9c50b189cc1 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -20,11 +20,10 @@ stdenv.mkDerivation rec { sha256 = "0nd44r8rbxifx4x4m24z5aji1c6k1fhw8cmf5s43wd5qys0bcdad"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ glib - intltool udev ]; diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index dbb5eb42e1d..2a14cbe24fb 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3"; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook intltool ]; - buildInputs = [ glib intltool gtk3 gtksourceview ]; + buildInputs = [ glib gtk3 gtksourceview ]; meta = with lib; { description = "A sticky note application for jotting down things to remember"; diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index d6514e58517..5e76e3a14d5 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf"; }; - nativeBuildInputs = [ imake gccmakedep ]; + nativeBuildInputs = [ imake gccmakedep pkg-config ]; buildInputs = [ libX11 libXt libXext libXpm - ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ]; + ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 938626806ca..46394c107de 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0xrc7crchflfrk4x5dq5zx22zkmgcrbkww5r1pvkc3cyyr18cc6h"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; + buildInputs = [ luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index 52204d5c79c..aa871df5e8a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; - buildInputs = [ libotr pidgin intltool ]; + nativeBuildInputs = [ intltool ]; + buildInputs = [ libotr pidgin ]; meta = with lib; { homepage = "https://otr.cypherpunks.ca/"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix index 9afdee8cda1..70cb3a9028d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-CdA/aUu+CmCRbVBKpJGydicqFQa/rEsLWS3MBKlH2/M="; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ glib intltool libappindicator-gtk2 libtool pidgin ]; + nativeBuildInputs = [ autoreconfHook intltool ]; + buildInputs = [ glib libappindicator-gtk2 libtool pidgin ]; meta = with lib; { description = "An AppIndicator and KStatusNotifierItem Plugin for Pidgin"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix index f393a17c1bc..7c076cb3724 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b"; }; - buildInputs = [ pidgin intltool python2 ]; + nativeBuildInputs = [ intltool ]; + buildInputs = [ pidgin python2 ]; meta = with lib; { homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 84f8f327cad..15e830b7687 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -16,7 +16,7 @@ let unwrapped = stdenv.mkDerivation rec { sha256 = "sha256-RUsbkovGvLsYM1OvMPv95VlfIkWjQjoaRubJei3yKBA="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper intltool ]; NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; @@ -27,7 +27,7 @@ let unwrapped = stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good libxml2 nss nspr libXScrnSaver python-with-dbus - avahi dbus dbus-glib intltool libidn + avahi dbus dbus-glib libidn libICE libXext libSM cyrus_sasl libgnt ncurses # optional: build finch - the console UI ] diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 7690bf6ee54..3e52d664d52 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { dontUseCmakeBuildDir = true; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rsync - lua pkg-config + lua asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt ]; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 251c7795132..9e5294c4b00 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { gettext makeWrapper wrapGAppsHook + pkg-config ]; buildInputs = [ @@ -55,7 +56,6 @@ stdenv.mkDerivation rec { libofx libxml2 libxslt - pkg-config swig webkitgtk ] diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index ff0d75711cf..81f97b116b0 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -19,12 +19,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-vTrbq/xLTfwF7/YtKzZFiiSw8A0HzzWin2ry8gPHej8="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; buildInputs = [ gtk libgsf libofx - intltool libsoup gnome.adwaita-icon-theme ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 2a00811a449..17a9cbb5924 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-Rg6OjHLkwVIDnXqzqPXA8DxqSdrh2T6V/gLBND8vx9o="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ gtk libofx intltool libsoup gnome.adwaita-icon-theme ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; + buildInputs = [ gtk libofx libsoup gnome.adwaita-icon-theme ]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c4435ca6269..43a1571b46e 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -555,7 +555,6 @@ in openssl pam perl - pkg-config poppler python3 sane-backends diff --git a/pkgs/applications/radio/rtl-ais/default.nix b/pkgs/applications/radio/rtl-ais/default.nix index c244868f65d..407c18c1a0a 100644 --- a/pkgs/applications/radio/rtl-ais/default.nix +++ b/pkgs/applications/radio/rtl-ais/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation { pname = "rtl-ais"; version = "0.8.1"; - buildInputs = [ pkg-config rtl-sdr libusb1 ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ rtl-sdr libusb1 ]; src = fetchFromGitHub { owner = "dgiardini"; diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index 0d352609cf0..3fd066ec7b7 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -10,7 +10,8 @@ mkDerivation rec { patches = [ ./remove-use-of-dlopen.patch ]; - buildInputs = [ libpulseaudio alsa-lib pkg-config qtbase ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libpulseaudio alsa-lib qtbase ]; CFLAGS ="-lasound -lpulse-simple"; meta = with lib; { diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 59af9a94d96..d47bd418f51 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - buildInputs = [ glib pkg-config gtk2 hamlib ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ glib gtk2 hamlib ]; meta = with lib; { description = "An amateur radio logging program"; diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index 9f88079627e..a4ec84d4d50 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx"; }; - buildInputs = [ autoreconfHook pkg-config zlib perl ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ zlib perl ]; meta = with lib; { description = "A set of tools written in Perl and C++ for working with VCF files, such as those generated by the 1000 Genomes Project"; diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index 59d7315ef41..0cc8bcb0fb3 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { }; patches = [ ./struct.patch ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [libglade gtk2 guile libxml2 - perl intltool libtool pkg-config]; + perl libtool ]; prebuild = '' cp drgeo.desktop.in drgeo.desktop diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 74f27fa534e..1c8c565528e 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -23,10 +23,11 @@ stdenv.mkDerivation rec { dontUseImakeConfigure = true; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu - pkg-config bison imake which blas lapack curl tcl tk jdk + bison imake which blas lapack curl tcl tk jdk ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 23069f335b8..7632b851773 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -28,9 +28,9 @@ assert (!blas.isILP64) && (!lapack.isILP64); # executable sage. No tests are run yet and no documentation is built. let + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pythonEnv # for patchShebangs - pkg-config blas lapack singular three @@ -72,7 +72,7 @@ let [] ); - allInputs = lib.remove null (buildInputs ++ pythonEnv.extraLibs ++ [ makeWrapper ]); + allInputs = lib.remove null (nativeBuildInputs ++ buildInputs ++ pythonEnv.extraLibs ++ [ makeWrapper ]); transitiveDeps = lib.unique (builtins.concatLists (map transitiveClosure allInputs )); # fix differences between spkg and sage names # (could patch sage instead, but this is more lightweight and also works for packages depending on sage) @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { pname = "sage-with-env"; src = sage-env.lib.src; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; configurePhase = "#do nothing"; diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix index 006616bd944..b05872b11e4 100644 --- a/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; }; - buildInputs = [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXft libXi xorgproto libSM libICE freetype which ]; configureFlags = [ "--with-x" diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index 0eccceb5a4f..ede0638e7a0 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -44,9 +44,10 @@ stdenv.mkDerivation { sha256 = "0badnkjsn3zps24r5iggj8k5v4f00npc77wqg92pcn1q5z8r677y"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXt libXft ncurses # required to build the terminfo file - fontconfig freetype pkg-config libXrender + fontconfig freetype libXrender libptytty ] ++ optional perlSupport perl ++ optional gdkPixbufSupport gdk-pixbuf; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index b363b54ee92..9b2c755b109 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { done ''; - nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ] + nativeBuildInputs = [ gettext perlPackages.perl makeWrapper pkg-config ] ++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ]; buildInputs = [ curl openssl zlib expat cpio libiconv bash ] @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals guiSupport [tcl tk] ++ lib.optionals withpcre2 [ pcre2 ] ++ lib.optionals stdenv.isDarwin [ Security CoreServices ] - ++ lib.optionals withLibsecret [ pkg-config glib libsecret ]; + ++ lib.optionals withLibsecret [ glib libsecret ]; # required to support pthread_cancel() NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 5e60bb7fd90..d7ad9846306 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -34,12 +34,11 @@ stdenv.mkDerivation { "-Wno-error=incompatible-pointer-types" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ which gnome.gnome-common glib - intltool libtool cairo gtk3 diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index cde71d2b87f..234d72e4682 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -66,9 +66,9 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "stackprotector" "fortify" "pic" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ - cmake which + which # Xen bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 33a313eb8ee..6dc22a664d3 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/fbpanel/${pname}-${version}.tbz2"; sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = - [ pkg-config libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ]; + [ libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ]; preConfigure = "patchShebangs ."; diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index 9e6b0666a11..18676018eff 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./rsvg-convert.patch ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ iconnamingutils imagemagick librsvg ]; propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; # still missing parent icon themes: cristalsvg diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index efec5c73ba2..3d91a4e7e72 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -21,11 +21,10 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - nativeBuildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake intltool ]; buildInputs = [ libtool - intltool ]; meta = with lib; { diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index d477b012261..69c687912e0 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -102,7 +102,6 @@ stdenv.mkDerivation rec { libXdamage muffin networkmanager - pkg-config polkit libxml2 libgnomekbd @@ -134,6 +133,7 @@ stdenv.mkDerivation rec { gtk-doc perl python3.pkgs.wrapPython + pkg-config ]; # use locales from cinnamon-translations (not using --localedir because datadir is used) diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 34dfaa85b2f..df63449c2f6 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ] ++ lib.optionals stdenv.isDarwin [ autoreconfHook ]; buildInputs = [ atk cairo glib gtk2 - pango libxml2Python perl intltool + pango libxml2Python perl gettext ] ++ optionals stdenv.isDarwin [ - autoreconfHook gnome-common gtk-mac-integration-gtk2 + gnome-common gtk-mac-integration-gtk2 ]; preConfigure = optionalString stdenv.isDarwin '' diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 580d0a8cc82..72422cf41c3 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool enchant isocodes autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook intltool ]; + buildInputs = [ enchant isocodes ]; } diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix index 4f4e0503f81..206494e7022 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { #http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html patches = [ ./01_remove-disable-deprecated.patch ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 intltool GConf enchant isocodes gnome-icon-theme ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 GConf enchant isocodes gnome-icon-theme ]; NIX_LDFLAGS = "-lgthread-2.0"; } diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 2c70338a900..56145980a5d 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra-gtk2 libtool ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ popt zlib GConf gnome_vfs libcanberra-gtk2 libtool ]; propagatedBuildInputs = [ glib libbonobo libogg ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix index 42de8c2471a..8d6bcce6020 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./glib.patch ./cups_1.6.patch ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 gettext intltool libart_lgpl ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 gettext libart_lgpl ]; propagatedBuildInputs = [ libxml2 ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix index bb2e435f422..5f7a254c8fb 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 gettext intltool libart_lgpl libgnomecups bison flex ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 gettext libart_lgpl libgnomecups bison flex ]; propagatedBuildInputs = [ libxml2 ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index a95ee70bca1..f8a647a5b5a 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -9,6 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome-icon-theme]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 gettext libgnomecanvas libgnomeprint gnome-icon-theme]; } diff --git a/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix index ca9b8f7fb81..e2f556c4869 100644 --- a/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome.gnome-devel-docs"; }; }; - buildInputs = [ intltool itstool libxml2 ]; + nativeBuildInputs = [ intltool ]; + buildInputs = [ itstool libxml2 ]; meta = with lib; { homepage = "https://github.com/GNOME/gnome-devel-docs"; diff --git a/pkgs/desktops/gnome/misc/gtkhtml/default.nix b/pkgs/desktops/gnome/misc/gtkhtml/default.nix index 88fb31c4333..f4454e15bb9 100644 --- a/pkgs/desktops/gnome/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome/misc/gtkhtml/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gtkhtml"; attrPath = "gnome.gtkhtml"; }; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk3 intltool gnome.adwaita-icon-theme + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme gsettings-desktop-schemas ]; propagatedBuildInputs = [ enchant isocodes ]; diff --git a/pkgs/desktops/lxde/core/lxmenu-data/default.nix b/pkgs/desktops/lxde/core/lxmenu-data/default.nix index e52445aa0b0..fc00c4cdad1 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data/default.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8"; }; - buildInputs = [ intltool ]; + nativeBuildInputs = [ intltool ]; meta = { homepage = "https://lxde.org/"; diff --git a/pkgs/development/compilers/gerbil/gerbil-crypto.nix b/pkgs/development/compilers/gerbil/gerbil-crypto.nix index 12f4726f1c6..38943471a37 100644 --- a/pkgs/development/compilers/gerbil/gerbil-crypto.nix +++ b/pkgs/development/compilers/gerbil/gerbil-crypto.nix @@ -7,7 +7,8 @@ gerbil-support.gerbilPackage { gerbil-package = "clan/crypto"; gerbil = gerbil-unstable; gerbilInputs = [gerbil-support.gerbilPackages-unstable.gerbil-utils]; - buildInputs = [pkgs.secp256k1 pkgs.pkg-config]; + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [pkgs.secp256k1 ]; gambit-params = gambit-support.unstable-params; version-path = "version"; softwareName = "Gerbil-crypto"; diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix index 9cb9954544c..f51076fd5d4 100644 --- a/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -24,12 +24,13 @@ rec { gerbil ? pkgs.gerbil-unstable, gambit-params ? pkgs.gambit-support.stable-params, gerbilInputs ? [], + nativeBuildInputs ? [], buildInputs ? [], buildScript ? "./build.ss", softwareName ? ""} : let buildInputs_ = buildInputs; in gccStdenv.mkDerivation rec { - inherit src meta pname version; + inherit src meta pname version nativeBuildInputs; passthru = { inherit gerbil-package version-path ;}; buildInputs = [ gerbil ] ++ gerbilInputs ++ buildInputs_; postPatch = '' diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix index 4354ce7e2d6..bcd52380701 100644 --- a/pkgs/development/compilers/polyml/5.6.nix +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { }) ]; - buildInputs = lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; src = fetchurl { url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz"; diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 9f6ecb2516e..0777fb8d48b 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -24,13 +24,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake + pkg-config ]; buildInputs = [ zlib sqlite gmp libffi cairo ncurses freetype libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2 freeglut libsamplerate pcre libevent libedit yajl - pkg-config glfw openssl libpthreadstubs libXdmcp + glfw openssl libpthreadstubs libXdmcp libmemcached python3 ]; diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix index 1173315192e..74360daa876 100644 --- a/pkgs/development/interpreters/qnial/default.nix +++ b/pkgs/development/interpreters/qnial/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "vrthra"; }; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper unzip pkg-config ]; preConfigure = '' cd build; @@ -25,7 +25,6 @@ stdenv.mkDerivation { ''; buildInputs = [ - pkg-config ncurses ]; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 6bb1a70b865..0ff8f0ea7fc 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-uNcaeTelFNfg+YjPYc7nK4TrFDxJsEuPhsF8x1cvIYQ="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ texinfo libXext xorgproto libX11 libXpm libXt libXcursor alsa-lib zlib libpng libvorbis libXxf86dga libXxf86misc libXxf86vm openal libGLU libGL libjpeg flac libXi libXfixes - enet libtheora freetype physfs libopus pkg-config gtk3 pcre libXdmcp + enet libtheora freetype physfs libopus gtk3 pcre libXdmcp libpulseaudio libpthreadstubs ]; diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index b9756e0e1a1..6f38bfa0d07 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -26,8 +26,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; outputBin = "dev"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = optional stdenv.isFreeBSD autoreconfHook; + nativeBuildInputs = [ makeWrapper ] ++ optional stdenv.isFreeBSD autoreconfHook; configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] ++ optional (!stdenv.isCygwin) "--with-crypto" diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index 4f7891910a7..697ff1a857b 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0kl1hzhb7cykzkrqcqgq1dk4xcgrcxv0jja251aq4z4l783jpj7j"; }; - nativeBuildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ ladspaH libjack2 liblo alsa-lib qt4 libX11 libsndfile libSM - libsamplerate libtool xorgproto libICE pkg-config + libsamplerate libtool xorgproto libICE ]; meta = with lib; { diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index e96aa9394da..f0b37b7e633 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - stdenv pkg-config + stdenv ] ++ lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi]; configureFlags = lib.optional enableX11 "--with-x11"; diff --git a/pkgs/development/libraries/ggz_base_libs/default.nix b/pkgs/development/libraries/ggz_base_libs/default.nix index 687b74fdb3a..162a64eeb5d 100644 --- a/pkgs/development/libraries/ggz_base_libs/default.nix +++ b/pkgs/development/libraries/ggz_base_libs/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1cw1vg0fbj36zyggnzidx9cbjwfc1yr4zqmsipxnvns7xa2awbdk"; }; - buildInputs = [ intltool openssl expat libgcrypt ]; + nativeBuildInputs = [ intltool ]; + buildInputs = [ openssl expat libgcrypt ]; patchPhase = '' substituteInPlace configure \ diff --git a/pkgs/development/libraries/gtk-engines/default.nix b/pkgs/development/libraries/gtk-engines/default.nix index e553efa5f25..d722143b210 100644 --- a/pkgs/development/libraries/gtk-engines/default.nix +++ b/pkgs/development/libraries/gtk-engines/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool gtk2 ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 ]; meta = { description = "Theme engines for GTK 2"; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index aca6ccdcccb..6f48ba4e266 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [aspell gtk2 enchant intltool]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [aspell gtk2 enchant]; meta = with lib; { description = "Word-processor-style highlighting and replacement of misspelled words"; diff --git a/pkgs/development/libraries/liberfa/default.nix b/pkgs/development/libraries/liberfa/default.nix index 8edc3d7b5a5..b59d3aab4a3 100644 --- a/pkgs/development/libraries/liberfa/default.nix +++ b/pkgs/development/libraries/liberfa/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "erfa"; version = "2.0.0"; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; src = fetchFromGitHub { owner = "liberfa"; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 7251e5b645b..29762e231f2 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -45,10 +45,11 @@ stdenv.mkDerivation rec { -e "s|pexe[[:blank:]]*=.*$|pexe = strdup(\"$out/lib/\");|g" ''; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libtool gettext zlib bzip2 flac libvorbis exiv2 libgsf rpm - pkg-config ] ++ lib.optionals gstreamerSupport ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) ++ lib.optionals gtkSupport [ glib gtk3 ] diff --git a/pkgs/development/libraries/libinklevel/default.nix b/pkgs/development/libraries/libinklevel/default.nix index dffbcdd69d1..f9c711df704 100644 --- a/pkgs/development/libraries/libinklevel/default.nix +++ b/pkgs/development/libraries/libinklevel/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-J0cEaC5v4naO4GGUzdfV55kB7KzA+q+v64i5y5Xbp9Q="; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - pkg-config libusb1 ]; diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index be4cdd62f6e..6cff9e3f03a 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -33,10 +33,9 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkg-config automake autoconf ]; + nativeBuildInputs = [ pkg-config automake autoconf intltool ]; buildInputs = [ libtool - intltool gobject-introspection glib gtk2 gtk-doc clutter clutter-gtk ]; diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 81e661a9421..2d916fa9a93 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { patches = [ ./libspectre-0.2.7-gs918.patch ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ # Need `libgs.so'. - pkg-config ghostscript cairo /*for tests*/ + ghostscript cairo /*for tests*/ ]; doCheck = true; diff --git a/pkgs/development/libraries/libspng/default.nix b/pkgs/development/libraries/libspng/default.nix index dba098b4468..077b414a665 100644 --- a/pkgs/development/libraries/libspng/default.nix +++ b/pkgs/development/libraries/libspng/default.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - pkg-config zlib ]; nativeBuildInputs = [ ninja meson + pkg-config ]; meta = with lib; { diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index 831ff2447a2..e726f07a7d8 100644 --- a/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - autoreconfHook libsodium ncurses check libconfig + libsodium ncurses check libconfig ] ++ lib.optionals (!stdenv.isAarch32) [ libopus ]; diff --git a/pkgs/development/libraries/libwnck/2.nix b/pkgs/development/libraries/libwnck/2.nix index fd7d80574a7..a1f54006beb 100644 --- a/pkgs/development/libraries/libwnck/2.nix +++ b/pkgs/development/libraries/libwnck/2.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 xorg.libX11 xorg.libXres ]; # ?another optional: startup-notification configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 9c2c2138461..f64fdbeba1d 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -45,7 +45,6 @@ mkDerivation rec { libvorbis libxml2 movit - pkg-config qtbase qtsvg sox @@ -56,7 +55,7 @@ mkDerivation rec { ladspaPlugins ]; - nativeBuildInputs = [ cmake which ]; + nativeBuildInputs = [ cmake which pkg-config ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index e93dfdfb144..2017d5435ea 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -57,7 +57,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake unzip pkg-config ]; buildInputs = [ - cmake libGLU libGL freetype diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix index fd89ede1efb..55a1b9dcb4c 100644 --- a/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ + nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index eafc773ef20..83f84d4d4fd 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-whbzoKIYLwj4yoFaT3frghJd/WzfpolSAuZzQRtnP5E="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ curl breakpad pkg-config ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ curl breakpad ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DSENTRY_BREAKPAD_SYSTEM=On" diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index 17e91f7e236..f26365fa8e6 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; }; - buildInputs = [ libusb-compat-0_1 libraw1394 dcraw intltool perl v4l-utils ]; + nativeBuildInputs = [ intltool ]; + buildInputs = [ libusb-compat-0_1 libraw1394 dcraw perl v4l-utils ]; patches = [ # Debian has a patch that fixes the build. diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index 76ce9a36c71..54d9bad1644 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -13,9 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0lngkvxnzn82rz558nvl96rvclrck07ja1pny7wcfixp9b68ppkn"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ - autoreconfHook nasm vapoursynth fftwFloat ]; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index ce2f7c20d3c..cc0049ef756 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "dev" "py" ]; - nativeBuildInputs = [ autoconf automake libtool pkg-config gettext swig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config gettext swig autoreconfHook ]; - buildInputs = [ autoreconfHook glib cryptsetup nss util-linux gpgme ncurses ]; + buildInputs = [ glib cryptsetup nss util-linux gpgme ncurses ]; configureFlags = [ "--with-gpgme-prefix=${gpgme.dev}" diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix index dfb76069c3b..59f1a2cd673 100644 --- a/pkgs/development/libraries/vte/2.90.nix +++ b/pkgs/development/libraries/vte/2.90.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gobject-introspection intltool glib gtk3 ncurses ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gobject-introspection glib gtk3 ncurses ]; configureFlags = [ "--enable-introspection" ]; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 92796b4116c..4ac58c3f3d0 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -21,13 +21,12 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ gnum4 gperf libtool libxcb - pkg-config xorg.utilmacros xorg.xcbutilimage xorg.xcbutilrenderutil diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index e5d5e111855..1ff2101b146 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -427,7 +427,8 @@ with prev; luv = prev.luaLib.overrideLuarocks prev.luv (drv: { - buildInputs = [ pkg-config libuv ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libuv ]; # Use system libuv instead of building local and statically linking extraVariables = { diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix index eacdda27f43..4588d0c04b0 100644 --- a/pkgs/development/ocaml-modules/gsl/default.nix +++ b/pkgs/development/ocaml-modules/gsl/default.nix @@ -13,7 +13,8 @@ buildDunePackage rec { sha256 = "1mpzcgbrha2l8iikqbmn32668v2mnnsykxg5n5jgs0qnskn2nvrn"; }; - buildInputs = [ dune-configurator gsl pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator gsl ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; meta = with lib; { diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 2ed9d860f8b..a8e8fee5ba7 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -572,7 +572,8 @@ in }; ruby-libvirt = attrs: { - buildInputs = [ libvirt pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libvirt ]; buildFlags = [ "--with-libvirt-include=${libvirt}/include" "--with-libvirt-lib=${libvirt}/lib" diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index 9c92764fdaf..30ae23e85a8 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { url = "mirror://gnu/gnu/mdk/v${version}/mdk-${version}.tar.gz"; sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool glib ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ glib ]; postInstall = '' mkdir -p $out/share/emacs/site-lisp/ cp -v ./misc/*.el $out/share/emacs/site-lisp diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index 405e7e7b9b0..4dc94dcf5d5 100644 --- a/pkgs/development/tools/memray/default.nix +++ b/pkgs/development/tools/memray/default.nix @@ -18,10 +18,11 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-zHdgVpe92OiwLC4jHVtT3oC+WnB30e5U3ZOHnmuo+Ao="; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libunwind lz4 - pkg-config ] ++ (with python3.pkgs; [ cython ]); diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index b20d172a403..27ff1b5e69d 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -17,8 +17,8 @@ let sha256 = "0zjba1090awxkmgifr9jnjkxf41zhzc4f6mrnbayn3v6s77ca9x4"; }; - nativeBuildInputs = [ pkg-config autoconf automake ]; - buildInputs = [popt avahi pkg-config python3 gtk3 which procps libiberty_static]; + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [popt avahi python3 gtk3 which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index a6a1129acad..46f8231680b 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -16,9 +16,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpermissive -Wno-error=narrowing -std=c++11"; # I'm too lazy to catch all gcc47-related problems hardeningDisable = [ "format" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat - freetype libjpeg wxGTK lua perl pkg-config zlib zip bzip2 libpng + freetype libjpeg wxGTK lua perl zlib zip bzip2 libpng libtiff fluidsynth libmikmod flac libvorbis libogg ]; diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index 416a3ac913e..71887c8b47d 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -13,11 +13,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-HIdJZeniSVM78VwI2rxh5gwFuz/VeJF4gBF/+KkQzU4="; }; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ libGLU libGL libX11 xorgproto tcl freeglut freetype sfml libXi libXmu libXext libXt libSM libICE - libpng pkg-config gettext intltool + libpng gettext ]; configureFlags = [ "--with-tcl=${tcl}/lib" ]; diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index b48d7e52cf3..ecdcbb7dce6 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -25,9 +25,11 @@ in stdenv.mkDerivation rec { sha256 = "19xximbcm6506kvpf3s0q96697kmzca3yrjdr6dgphklp33zqsqr"; }; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx - pkg-config intltool fontconfig libzip zip zlib + fontconfig libzip zip zlib ]; preConfigure = '' diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index eefbb90114f..af75ec79e73 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto @@ -51,7 +52,6 @@ stdenv.mkDerivation rec { gnuchess texinfo libXpm - pkg-config librsvg cairo pango diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index 07b81ce9bc2..12e4f5cac96 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -44,7 +44,7 @@ let sha256 = "sha256:069z6ijmql62mcdyxnzc9mf0dxa6z1107cd0ab4i1adk8kr3d75k"; }; - buildInputs = [ cups zlib jbigkit glib gtk3 pkg-config gnome2.libglade libxml2 gdk-pixbuf pango cairo atk ]; + buildInputs = [ cups zlib jbigkit glib gtk3 gnome2.libglade libxml2 gdk-pixbuf pango cairo atk ]; in stdenv.mkDerivation rec { pname = "canon-cups-ufr2"; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ) ''; - nativeBuildInputs = [ makeWrapper unzip autoconf automake libtool_1_5 ]; + nativeBuildInputs = [ makeWrapper unzip autoconf automake libtool_1_5 pkg-config ]; inherit buildInputs; diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 87c81531122..74155f43c2b 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { "--enable-imlib2" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ - autoreconfHook libX11 + libX11 pam libgcrypt libXrender imlib2 ]; diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix index eb0d6a4109d..478cbda3dc0 100644 --- a/pkgs/misc/stabber/default.nix +++ b/pkgs/misc/stabber/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { mkdir m4 ''; - buildInputs = [ autoreconfHook pkg-config glib expat libmicrohttpd ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ glib expat libmicrohttpd ]; meta = { description = "Stubbed XMPP Server"; diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix index ebfe492f736..43c9bf74e3f 100644 --- a/pkgs/os-specific/linux/libpsm2/default.nix +++ b/pkgs/os-specific/linux/libpsm2/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ numactl pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ numactl ]; makeFlags = [ # Disable blanket -Werror to avoid build failures diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix index 95b766aec05..e9925b95bcd 100644 --- a/pkgs/os-specific/linux/lightum/default.nix +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -11,13 +11,14 @@ stdenv.mkDerivation { sha256 = "sha256-dzWUVY2srgk6BM6jZ7FF+snxnPopz3fx9nq+mVkmogc="; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dbus glib libX11 libXScrnSaver libXext - pkg-config systemd ]; diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index ebd45246ae8..1264894ad0c 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { buildInputs = [ # pam_usb dependencies - dbus libxml2 pam pmount pkg-config + dbus libxml2 pam pmount # pam_usb's tools dependencies python # cElementTree is included with python 2.5 and later. diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index 0f65e0278ca..8267a2d4a7f 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036"; }; - buildInputs = [ intltool util-linux ]; + nativeBuildInputs = [ intltool util-linux ]; + buildInputs = [ util-linux ]; configureFlags = [ "--with-media-dir=${mediaDir}" diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index bba646e583b..4092e3797c2 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -12,9 +12,11 @@ stdenv.mkDerivation { sha256 = "133rd2kvr2q2wmwpx82bb93qbi8wm8qp1vlmbhgc7aslz0j4cqqv"; }; + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = - [ autoreconfHook xorgproto libX11 libXext pixman - pkg-config utilmacros xorgserver + [ xorgproto libX11 libXext pixman + utilmacros xorgserver ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/servers/matrix-conduit/default.nix index 4eced54bc72..d328a8d5c23 100644 --- a/pkgs/servers/matrix-conduit/default.nix +++ b/pkgs/servers/matrix-conduit/default.nix @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = with pkgs; [ rustPlatform.bindgenHook + pkg-config ]; buildInputs = with pkgs; [ - pkg-config rocksdb ]; diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix index 82aa67a45d4..24e7b87f5c7 100644 --- a/pkgs/servers/web-apps/lemmy/ui.nix +++ b/pkgs/servers/web-apps/lemmy/ui.nix @@ -14,8 +14,8 @@ let pkgConfig = { node-sass = { - nativeBuildInputs = [ ]; - buildInputs = [ libsass pkg-config python3 ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libsass python3 ]; postInstall = '' LIBSASS_EXT=auto yarn --offline run build rm build/config.gypi diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index 94672ffe6f1..286883722f6 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -14,8 +14,8 @@ gnustep.stdenv.mkDerivation rec { hash = "sha256-3Xy0y1sdixy4gXhzhP9mfWeaDmOVJty+X95xCyxayPE="; }; - nativeBuildInputs = [ gnustep.make makeWrapper python3 ]; - buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oath-toolkit ] + nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ]; + buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip openldap oath-toolkit ] ++ lib.optional enableActiveSync libwbxml; patches = lib.optional enableActiveSync ./enable-activesync.patch; diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 9beb0553395..2d132b389be 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -12,6 +12,7 @@ in stdenv.mkDerivation { ./no_title_crash.patch ./extern-patch.patch ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libXinerama xorg.libAppleWM @@ -19,7 +20,6 @@ in stdenv.mkDerivation { xorg.libXrandr xorg.libXext pixman - pkg-config AppKit Xplugin Foundation ]; meta = with lib; { diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index d2236dfe354..c16da204f2f 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -33,9 +33,10 @@ stdenv.mkDerivation rec { --replace 'LIBSEMA="CCC"' 'LIBSEMA=""' ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXext libXtst gtk2 - libXi pkg-config + libXi texinfo ]; diff --git a/pkgs/tools/audio/midimonster/default.nix b/pkgs/tools/audio/midimonster/default.nix index 3792d997aa0..841704427c2 100644 --- a/pkgs/tools/audio/midimonster/default.nix +++ b/pkgs/tools/audio/midimonster/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { pname = "midimonster"; version = "0.6.0"; - buildInputs = [pkg-config gnumake gcc lua5_4 openssl jack1 python3 alsa-lib ncurses libevdev]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [gnumake gcc lua5_4 openssl jack1 python3 alsa-lib ncurses libevdev]; src = fetchFromGitHub { repo = "midimonster"; diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index 94ba5a56d03..924181608af 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -31,10 +31,9 @@ in stdenv.mkDerivation { sha256 = "0vdksf6lcgmizqr5mqp0bbci259k0dj7gpmhx32md41jlmw5skaw"; }; - nativeBuildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ libtool - pkg-config glib libdaemon pandoc diff --git a/pkgs/tools/backup/dump/default.nix b/pkgs/tools/backup/dump/default.nix index 75a449a1276..f9e1b68ac39 100644 --- a/pkgs/tools/backup/dump/default.nix +++ b/pkgs/tools/backup/dump/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-0CGs3k+77T2T662YFCL2cfSNZrKeyI196DZC7Pv/T9A="; }; - buildInputs = [ e2fsprogs pkg-config ncurses readline ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ e2fsprogs ncurses readline ]; meta = with lib; { homepage = "https://dump.sourceforge.io/"; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index 61843e4c65b..24233a8441d 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1h8ggvhw30n2r6w11n1s458ypggdqx6ldwd61ma4yd7binrlpjq1"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = - [ pkg-config fuse openssl + [ fuse openssl asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix index c1124880944..d3f8b74512a 100644 --- a/pkgs/tools/graphics/s2png/default.nix +++ b/pkgs/tools/graphics/s2png/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0y3crfm0jqprgxamlly713cka2x1bp6z63p1lw9wh4wc37kpira6"; }; - buildInputs = [ diffutils gd pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ diffutils gd ]; installFlags = [ "prefix=" "DESTDIR=$(out)" ]; meta = { diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index 27bf0ec5374..eb7a73e469c 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { patchPhase = if stdenv.cc.isClang then "${perl}/bin/perl ./nomacro.pl" else null; - buildInputs = [ curl jansson autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ curl jansson ]; configureFlags = [ "CFLAGS=-O3" ]; diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix index c906443b07c..22b5035da51 100644 --- a/pkgs/tools/misc/notify-desktop/default.nix +++ b/pkgs/tools/misc/notify-desktop/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "1brcvl2fx0yzxj9mc8hzfl32zdka1f1bxpzsclcsjplyakyinr1a"; }; - buildInputs = [ dbus pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dbus ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index 238c0c364f9..f2af99a922f 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-iRaf9/gu9VkGi1VbGpxvC5q+0M8ivezCz/oAKEg5V1M="; }; - buildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; # Note: Although `nss-mdns' works by talking to `avahi-daemon', it # doesn't depend on the Avahi libraries. Instead, it contains # hand-written D-Bus code to talk to the Avahi daemon. diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix index 668dc18f8ac..89a7d706ccd 100644 --- a/pkgs/tools/networking/sipsak/default.nix +++ b/pkgs/tools/networking/sipsak/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { pname = "sipsak"; version = "4.1.2.1"; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ - autoreconfHook openssl c-ares ]; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 2fc102f5300..25fcc1bcc39 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -57,11 +57,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB - nativeBuildInputs = [ makeWrapper ] + nativeBuildInputs = [ makeWrapper pkg-config ] ++ lib.optionals withPythonModule [ swig ]; buildInputs = [ openssl nettle expat libevent ] - ++ lib.optionals withSystemd [ pkg-config systemd ] + ++ lib.optionals withSystemd [ systemd ] ++ lib.optionals withDoH [ libnghttp2 ] ++ lib.optionals withPythonModule [ python ]; diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix index 18104aa7710..8081c7ef6eb 100644 --- a/pkgs/tools/security/chrome-token-signing/default.nix +++ b/pkgs/tools/security/chrome-token-signing/default.nix @@ -11,7 +11,8 @@ mkDerivation rec { sha256 = "sha256-wKy/RVR7jx5AkMJgHXsuV+jlzyfH5nDRggcIUgh2ML4="; }; - buildInputs = [ qmake pcsclite pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ qmake pcsclite ]; dontUseQmakeConfigure = true; patchPhase = '' diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index cd90342738e..777aaea41ec 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals (!enablePython) [ "--disable-pywrap" ]; - nativeBuildInputs = [ pkg-config makeWrapper ] + nativeBuildInputs = [ pkg-config makeWrapper intltool ] # if python2 support is requested, it is needed at builtime as well as runtime. ++ lib.optionals (enablePython) [ python2 ] ; - buildInputs = [ perl nss nspr pam intltool ] + buildInputs = [ perl nss nspr pam ] ++ lib.optionals (enablePython) [ python2 ] ; propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ]; diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 15d5a5adcff..69e6c7f0281 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1lfzja3vzd6l6hfvw8gvg4qkl5iy6gra5pa8gjlps9l63k2bjfhz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gnupg gtk3 libxml2 intltool nettle ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gnupg gtk3 libxml2 nettle ]; meta = with lib; { description = "GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements"; diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix index 1e46df40f85..22c11b3f2b1 100644 --- a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix +++ b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-Kb8p53gPkhxtOhH2COKwSDwbtRDFr6hHMJAkndV8Ukk="; }; - buildInputs = [ pkcs11helper pkg-config openssl ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pkcs11helper openssl ]; configureFlags = [ "--with-libgpg-error-prefix=${libgpg-error.dev}" diff --git a/pkgs/tools/security/metasploit/shell.nix b/pkgs/tools/security/metasploit/shell.nix index e4bae57b686..ccd510f63af 100644 --- a/pkgs/tools/security/metasploit/shell.nix +++ b/pkgs/tools/security/metasploit/shell.nix @@ -2,6 +2,7 @@ with import <nixpkgs> {}; stdenv.mkDerivation { name = "env"; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bundix git @@ -9,7 +10,6 @@ stdenv.mkDerivation { libpcap libxml2 libxslt - pkg-config postgresql ruby.devEnv sqlite diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 329de10ff6b..249762781e7 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ intltool ]; - buildInputs = [ intltool gtk3 gobject-introspection ]; + buildInputs = [ gtk3 gobject-introspection ]; propagatedBuildInputs = with python3.pkgs; [ stem distutils_extra pygobject3 ]; postFixup = '' diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index 5fc242d533b..eedb0f07d13 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 libxml2 intltool gettext ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 libxml2 gettext ]; patches = [ ./get_sensitive.patch ./set_flags.patch ]; diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index 9a6b1880950..d5f820d0d60 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -50,7 +50,7 @@ rec { }).overrideDerivation (old: { propagatedBuildInputs = [ zlib ]; - buildInputs = old.buildInputs ++ [ pkg-config ]; + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkg-config ]; # just override it with nothing so it does not fail autoreconfPhase = "echo autoreconfPhase not used..."; @@ -87,7 +87,7 @@ rec { pname = "xmlmirror"; version = "unstable-2016-06-05"; - buildInputs = [ pkg-config libtool gnumake libxml2 nodejs openjdk json_c ]; + buildInputs = [ libtool gnumake libxml2 nodejs openjdk json_c ]; nativeBuildInputs = [ pkg-config zlib autoconf automake ]; src = pkgs.fetchgit { @@ -140,7 +140,7 @@ rec { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation (old: { - buildInputs = old.buildInputs ++ [ pkg-config ]; + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkg-config ]; # we need to reset this setting! NIX_CFLAGS_COMPILE=""; dontStrip = true; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6a5806736e9..564f9d5ecc5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13873,7 +13873,8 @@ let url = "mirror://cpan/authors/id/L/LK/LKUNDRAK/Log-Journald-0.30.tar.gz"; hash = "sha256-VZks+aHh+4M/QoMAUlv6fPftRrg+xBT4KgkXibN9CKM="; }; - buildInputs = [ pkgs.pkg-config pkgs.systemd ]; + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ pkgs.systemd ]; postPatch = '' substituteInPlace Build.PL \ --replace "libsystemd-journal" "libsystemd" @@ -20935,7 +20936,8 @@ let url = "mirror://cpan/authors/id/L/LK/LKUNDRAK/RPM2-1.4.tar.gz"; hash = "sha256-XstCqmkyTm9AiKv64HMTkG5aq/L0bxIE8/HeWRVbtjY="; }; - buildInputs = [ pkgs.pkg-config pkgs.rpm ]; + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ pkgs.rpm ]; doCheck = false; # Tries to open /var/lib/rpm meta = { description = "Perl bindings for the RPM Package Manager API"; @@ -27230,7 +27232,8 @@ let url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.99.tar.gz"; hash = "sha256-En4XqHf7YeR7nouHv42q0xM5pioAEh+XUdUitDiw9/A="; }; - buildInputs = [ pkgs.pkg-config pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; propagatedBuildInputs = [ XMLLibXML ]; meta = { description = "Interface to the GNOME libxslt library"; @@ -27806,7 +27809,8 @@ let makeMakerFlags = "--prefix-openssl=${pkgs.openssl_1_1.dev}"; - buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl_1_1 pkgs.pkg-config ]; + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl_1_1 ]; meta = { description = "Perl wrapper for the ldns DNS library"; license = with lib.licenses; [ bsd3 ]; |