diff options
Diffstat (limited to 'pkgs/tools/misc')
35 files changed, 69 insertions, 36 deletions
diff --git a/pkgs/tools/misc/appdata-tools/default.nix b/pkgs/tools/misc/appdata-tools/default.nix index cdb5abcf453c..54c78874dd2e 100644 --- a/pkgs/tools/misc/appdata-tools/default.nix +++ b/pkgs/tools/misc/appdata-tools/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1bzqg4gy8gqhbk2qjizsm0b78li9mv84fb3d8qwfpxh7c7p360x8"; }; - buildInputs = [ pkgconfig autoconf automake m4 intltool glib + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake m4 intltool glib libsoup gdk_pixbuf ]; configureScript = "./autogen.sh"; diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index 29b199e5866b..9a09fba93e69 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "05hbnp20cdvyyqf6jr01waz1ycis20qzsd8hn27snmn6qd48igrb"; }; - buildInputs = [ libusb1 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb1 ]; configurePhase = '' cd commandline diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index af9861ea6ed5..ea1ac6d116b1 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0slrqanwj9cm7ql0rpb296xq676zrc1sjyr13lh5lygp4b8qfpci"; }; - buildInputs = [ pkgconfig bluez ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bluez ] ++ stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional systemdSupport systemd; diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index 96022d01ef7d..c26f835c0ee5 100644 --- a/pkgs/tools/misc/colord-gtk/default.nix +++ b/pkgs/tools/misc/colord-gtk/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0i9y3bb5apj6a0f8cx36l6mjzs7xc0k7nf0magmf58vy2mzhpl18"; }; - buildInputs = [ intltool colord glib gtk3 pkgconfig lcms2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool colord glib gtk3 lcms2 ]; meta = { homepage = http://www.freedesktop.org/software/colord/intro.html; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 46f3786a6df3..40ea672296d8 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m"; }; - nativeBuildInputs = [ autoreconfHook intltool ]; enableParallelBuilding = true; @@ -34,7 +33,9 @@ stdenv.mkDerivation rec { sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in} ''; - buildInputs = [ glib polkit pkgconfig gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection + nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + + buildInputs = [ glib polkit gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection bash-completion argyllcms libgudev sane-backends ]; postInstall = '' diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index dfa6bf71bb44..6bbf049d2445 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "CUnit-${version}"; version = "2.1-3"; - buildInputs = [autoconf automake libtool autoreconfHook]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [autoconf automake libtool]; src = fetchurl { url = "mirror://sourceforge/cunit/CUnit/${version}/${name}.tar.bz2"; diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix index b6f483fb4efd..8dcaecf9851c 100644 --- a/pkgs/tools/misc/dbus-map/default.nix +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { rev = "43703fc5e15743309b67131b5ba457b0d6ea7667"; sha256 = "1pjqn6w29ci8hfxkn1aynzfc8nvy3pqv3hixbxwr7qx20g4rwvdc"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig glib procps libxml2 + glib procps libxml2 ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 039ec27947af..e5e3815481f1 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1ianvr2a69yjv4rpyv30w7yjsmnsb23crrka5ndqxycj4rkk4dc4"; }; - buildInputs = [ pkgconfig glib libintlOrEmpty ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libintlOrEmpty ]; NIX_LDFLAGS = optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index 06862a634238..7e98b7d64d2d 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1h7vll8a78ijan9bmnimmsviywmc39x8h9iikx8vm98kwyxi4xif"; }; - buildInputs = [ autoreconfHook pkgconfig tokyocabinet cairo pango ncurses ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ tokyocabinet cairo pango ncurses ]; meta = with stdenv.lib; { homepage = http://duc.zevv.nl/; diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix index f773ae6caac5..b44159be8ce8 100644 --- a/pkgs/tools/misc/eot-utilities/default.nix +++ b/pkgs/tools/misc/eot-utilities/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0cb41riabss23hgfg7vxhky09d6zqwjy1nxdvr3l2bh5qzd4kvaf"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = http://www.w3.org/Tools/eot-utils/; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index ee7854c539ed..c7fd29da8ac4 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -32,8 +32,9 @@ stdenv.mkDerivation rec { # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries NIX_CFLAGS_COMPILE = lib.optionals stdenv.isi686 [ "-msse2" "-mfpmath=sse" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake gnum4 libtool perl pkgconfig gettext uthash + autoconf automake gnum4 libtool perl gettext uthash python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] ++ lib.optionals withSpiro [libspiro] diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix index 1ba4bceb7876..6307d012debd 100644 --- a/pkgs/tools/misc/gbdfed/default.nix +++ b/pkgs/tools/misc/gbdfed/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx"; }; - buildInputs = [ pkgconfig freetype gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ freetype gtk ]; patches = [ ./Makefile.patch ]; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 424a84637a53..8586244b4152 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { "--enable-utf8" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig geoipWithDatabase ncurses glib diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index a690ef2084b2..bb565bacfe79 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -34,7 +34,8 @@ stdenv.mkDerivation { ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch); # autoreconfHook required for the splashimage patch. - buildInputs = [ autoreconfHook texinfo ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ texinfo ]; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index f362e7c53a24..d4322f051d0a 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1ipykzqpfvlr84j38hr7q2cag4imrn1gql10slp8bfrs4h1si3vh"; }; - buildInputs = [ smartmontools gtkmm2 libglademm pkgconfig pcre ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ smartmontools gtkmm2 libglademm pcre ]; #installTargets = "install datainstall"; diff --git a/pkgs/tools/misc/kalibrate-rtl/default.nix b/pkgs/tools/misc/kalibrate-rtl/default.nix index 19870b8de5b8..19ebd05e23c1 100644 --- a/pkgs/tools/misc/kalibrate-rtl/default.nix +++ b/pkgs/tools/misc/kalibrate-rtl/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn"; }; - buildInputs = [ autoreconfHook pkgconfig fftw rtl-sdr libusb1 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ fftw rtl-sdr libusb1 ]; meta = with stdenv.lib; { description = "Calculate local oscillator frequency offset in RTL-SDR devices"; diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index d96409809a6e..72c9cecf5406 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030"; }; - buildInputs = [ openldap openssl popt glib ncurses readline pkgconfig cyrus_sasl autoconf automake ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openldap openssl popt glib ncurses readline cyrus_sasl autoconf automake ]; preConfigure = '' cd ldapvi diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index 1f45626855f5..989c1f57b6ef 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -13,7 +13,8 @@ in stdenv.mkDerivation { sha256 = "1g79hl6jmf5dam7vq19h4dgdj7gcn19fa7q78vn573mg2rdyal53"; }; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; propagatedBuildInputs = [ libsodium czmqpp libbitcoin ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index fbfa385fc7fc..7b6da9bdd3ed 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -13,7 +13,8 @@ in stdenv.mkDerivation { sha256 = "00123vw7rxk0ypdfzk0xwk8q55ll31000mkjqdzl915krsbkbfvp"; }; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; propagatedBuildInputs = [ libbitcoin-client ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 61c462f7853f..6d0c7b4e9c95 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -13,7 +13,8 @@ in stdenv.mkDerivation { sha256 = "1lpdjm13kgs4fbp579bwfvws8yf9mnr5dw3ph8zxg2gf110h85sy"; }; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; propagatedBuildInputs = [ secp256k1 ]; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 0828fea81e1c..fb4093d89b86 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1pzjq4nfxl2aakxipdjs5hq9n14374ly1l00s40kd2djnnxmd7pb"; }; - buildInputs = [ pkgconfig perl glib slang zip unzip file gettext libX11 libICE + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl glib slang zip unzip file gettext libX11 libICE libssh2 openssl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; configureFlags = [ "--enable-vfs-smb" ]; diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index 165780a5fa19..acb3bd9d3773 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi"; }; - buildInputs = [glib readline bison flex pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [glib readline bison flex]; preConfigure = '' sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index 4f76306ab5f9..6289c35f35a7 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation { sha256 = "0hlf5lk86xm0bpdlpk4a1zyfvbim76dhvmybxga2p7mbb1jc825l"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glib readline bison flex autoreconfHook pkgconfig which txt2man + glib readline bison flex autoreconfHook which txt2man gnome_doc_utils scrollkeeper libiconv ]; diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix index 9a435622c7d7..2aea2530057c 100644 --- a/pkgs/tools/misc/mprime/default.nix +++ b/pkgs/tools/misc/mprime/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation { unpackCmd = "unzip -d src -q $curSrc"; - buildInputs = [ unzip pkgconfig curl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ unzip curl ]; patches = [ ./makefile.patch ]; diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index f92069e7b9f5..267b458cccc6 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { makeFlags = "prefix=$(out)"; - buildInputs = [ glib gettext readline pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gettext readline ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 663c60d28569..6a5e674b698b 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/qjoypad/${name}.tar.gz"; sha256 = "1jlm7i26nfp185xrl41kz5z6fgvyj51bjpz48cg27xx64y40iamm"; }; - buildInputs = [ pkgconfig libX11 libXtst qt4 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXtst qt4 ]; patchPhase = '' cd src substituteInPlace config --replace /bin/bash /bin/sh diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 54e5a3ab17e0..07c14ac76267 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1j3wgf9xigsv6ckmv82gjj4wavi7xjn2zvj1f63fzbaa1rv7pf3s"; }; - buildInputs = [ autoreconfHook pkgconfig file protobufc ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ file protobufc ]; meta = with stdenv.lib; { homepage = https://github.com/algernon/riemann-c-client; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index e321670068cf..2ff86f5cbdf6 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { configurePhase = "scons config"; - buildInputs = [ gettext glib json_glib libelf pkgconfig scons sphinx utillinux ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext glib json_glib libelf scons sphinx utillinux ]; buildPhase = "scons"; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 3e2953c57334..d6cad51ce753 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -28,8 +28,9 @@ in stdenv.mkDerivation { sha256 = "0a0wwklzk1kvk3bbxxfvxgk4ck5dn7a7v32shqidb674fr2d5pvb"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - which autoconf automake pkgconfig libtool libcap ostree rpm glib libgsystem gperf + which autoconf automake libtool libcap ostree rpm glib libgsystem gperf json_glib libarchive libsolv librepo gtk_doc libxslt docbook_xsl docbook_xml_dtd_42 cmake pcre check python # FIXME: get rid of this once libarchive properly propagates this diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index f9fee08d0dd0..2b240e022d81 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1pl118qb7g0frpgl9ps43w4sd0psjirpmq54yg1kqcclqcqbbm49"; }; - buildInputs = [ pkgconfig libcaca ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libcaca ]; meta = { description = "Display large colourful characters in text mode"; diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 8d9d0073b178..99cd407a9ae4 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "0pyl0y27136nr8mmjdml7zjnfnpbjmgqzkjk99j3hvj38k10wq7f"; }; - buildInputs = [ gettext pkgconfig autoconf automake libtool bison flex which + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext autoconf automake libtool bison flex which subversion makeWrapper readline libftdi libusb python3 ]; configureFlags = '' diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index a18c03b126ac..59efcaa18095 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc"; }; - buildInputs = [ zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib imagemagick libpng glib libgsf libxml2 bzip2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index f39eaf0b047b..b9a8f70ff71a 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-include.patch ]; - buildInputs = [ pkgconfig cmake libgsf glib libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake libgsf glib libxml2 ]; NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 350cb89846a7..604868f8c490 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "04mrc8j0rr7iy1k6brfxnx26pmxm800gh4nqrxn6j2lz6vd5y9m5"; }; - buildInputs = [ libX11 autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libX11 ]; # We need a README file, otherwise autoconf complains. postUnpack = '' diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 6ff08e4ac3fa..c01e419ab239 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0l9lkzwi2227y5y02i5g1d701bmlyaj8lffv72jks1w4mkh7q7qh"; }; - buildInputs = [ pkgconfig openssl pcsclite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl pcsclite ]; configureFlags = [ "--with-backend=pcsc" ]; |