diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-05 17:26:13 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-21 15:49:53 -0400 |
commit | 531e4b80c97002a542beb8fe356177ebd66cdd8e (patch) | |
tree | 4fb5b90d44ecb5a7b15fdc7d6e10bda66f4542f0 /pkgs/development/tools | |
parent | fd9c7eb2e8c1755b606cb0d7dab2ba0bb93e36ed (diff) | |
download | nixpkgs-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar nixpkgs-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.gz nixpkgs-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.bz2 nixpkgs-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.lz nixpkgs-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.xz nixpkgs-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.zst nixpkgs-531e4b80c97002a542beb8fe356177ebd66cdd8e.zip |
misc pkgs: Basic sed to get fix `pkgconfig` and `autoreconfHook` `buildInputs`
Only acts on one-line dependency lists.
Diffstat (limited to 'pkgs/development/tools')
37 files changed, 76 insertions, 38 deletions
diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index cbe6e5fdde9..c960f54ab20 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; preConfigure = "patchShebangs src/bin-to-c-source.py"; - buildInputs = [ cmake pkgconfig zlib curl elfutils python libiberty binutils ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake zlib curl elfutils python libiberty binutils ]; meta = with stdenv.lib; { description = "Code coverage tester for compiled programs, Python scripts and shell scripts"; diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index 6b7ba2a81cb..31530a2751b 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [pkgconfig readline libusb perl] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ readline libusb perl] ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] ++ optional pythonBindings [python] diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 1572fff40b9..a4cf3bcd649 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { '(*info->fprintf_func) (info->stream, "%s", errmsg);' ''; - buildInputs = [pkgconfig readline libusb libewf perl zlib openssl] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ readline libusb libewf perl zlib openssl] ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] ++ optional pythonBindings [python] diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index f5c5c616979..9dc1e2db8c0 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation { sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy"; }; - buildInputs = [sqlite pkgconfig perl] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [sqlite perl] ++ stdenv.lib.optional buildllvmsparse llvm ++ stdenv.lib.optional buildc2xml libxml2; diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index 6898b7eee54..945f6c80af5 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g" ''; - buildInputs = [ pkgconfig libxml2 llvm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 llvm ]; doCheck = true; meta = { diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 56d4b831460..253aadb86d7 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation { ./impure-dirs.patch ]; - buildInputs = stdenv.lib.optionals guileSupport [ guile pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = stdenv.lib.optionals guileSupport [ guile ]; configureFlags = stdenv.lib.optional guileSupport "--with-guile"; diff --git a/pkgs/development/tools/build-managers/nant/default.nix b/pkgs/development/tools/build-managers/nant/default.nix index 858fc5b48df..5da32f2334a 100644 --- a/pkgs/development/tools/build-managers/nant/default.nix +++ b/pkgs/development/tools/build-managers/nant/default.nix @@ -15,7 +15,8 @@ let name = "nant-bootstrapped-${version}"; inherit src; - buildInputs = [ pkgconfig mono makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mono makeWrapper ]; buildFlags = "bootstrap"; @@ -35,7 +36,8 @@ in stdenv.mkDerivation { name = "nant-${version}"; inherit src; - buildInputs = [ pkgconfig mono makeWrapper nant-bootstrapped ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mono makeWrapper nant-bootstrapped ]; dontStrip = true; diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 828fe20ecc5..fd27d927bd5 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0jzp1llq6635ldb7j9qb29j2k0x5mblimdqg3179dvva1hv0ia23"; }; - buildInputs = [ fuse pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse ]; configurePhase = '' sed -i 's/`git describe`/v${version}/g' Tupfile diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index ef339d47ea0..5f0b6b628cb 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -11,6 +11,7 @@ python2Packages.buildPythonApplication { }; configureFlags = "--disable-scrollkeeper"; - buildInputs = [ libxslt pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxslt intltool ]; propagatedBuildInputs = [ libxml2Python ]; } diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 030693714f0..15b552fb4aa 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { # Note: Glib support is optional, but it's quite useful (e.g., it's # used by Guile-GNOME). - buildInputs = [ guile pkgconfig glib guile_lib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ guile glib guile_lib ]; propagatedBuildInputs = [ libffi ]; diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index abfbc9a6c47..1f4c21cb7f9 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1qr02ny97navqxr56xq1a227yzf6h09m8jlvc9bnjl0bsk6887bl"; }; - buildInputs = [ pkgconfig libzip glib libusb1 libftdi1 check libserialport + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libzip glib libusb1 libftdi1 check libserialport librevisa doxygen glibmm python ]; diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index e421a709c89..57bb159c586 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1hfigfj1976qk11kfsgj75l20qvyq8c9p2h4mjw23d59rsg5ga2a"; }; - buildInputs = [ pkgconfig glib python3 libsigrok check ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib python3 libsigrok check ]; meta = with stdenv.lib; { description = "Protocol decoding library for the sigrok signal analysis software suite"; diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index ca8c2de9630..37c5dab8ce8 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { url = http://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz; sha256 = "0c24wzrzbk0l4z1p5nnxihaqra75amwmw59va44554infkfms9kc"; }; - buildInputs = [ intltool pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib ]; postInstall = '' mkdir -p $out/share/emacs/site-lisp/ cp -v ./misc/*.el $out/share/emacs/site-lisp diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix index 77cb8676669..ca6cb14c2a4 100644 --- a/pkgs/development/tools/misc/avarice/default.nix +++ b/pkgs/development/tools/misc/avarice/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0jhh1h1k5b41v2ycq8kn43nkrkh0b9l7xjmw38rak871g3z3hix1"; }; - buildInputs = [ pkgconfig gcc perl libusb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gcc perl libusb ]; meta = { license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index a82fae13255..2adc61ce645 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0z0k4qvz4ypxs4dmgrzv9da7ylf6jr94ra6nylqpfrdspvjzwj92"; }; - buildInputs = [ pkgconfig glib libuuid popt elfutils ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libuuid popt elfutils ]; meta = with stdenv.lib; { description = "Command-line tool and library to read and convert LTTng tracefiles"; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 4fec00a2fd7..bd08c6c4c05 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -13,7 +13,8 @@ in pythonPackages.buildPythonApplication rec { sha256 = "a3dc940c66f84b996c328531e3034d475ec690d7ff639445ff7ca746aa8cb9c2"; }; - buildInputs = [ pkgconfig libxml2 itstool intltool glib gtk3 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 itstool intltool glib gtk3 gnome3.defaultIconTheme makeWrapper libwnck3 ]; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 17ef6647050..cef399eb5c1 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -16,7 +16,8 @@ let sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; }; - buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake pkgconfig which procps libiberty_static]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index a6de652f900..27dadd08e56 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; - buildInputs = [ pkgconfig glib dbus dbus_glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib dbus dbus_glib ]; meta = { homepage = https://hal.freedesktop.org/releases/; diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index b8e2a9a189b..cdddad5155f 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { sha256 = "1g329aapdvbzhr39wyh295shpfq5f0nlzsqkjnr8l6zzak7f4yrg"; }; - buildInputs = [ autoreconfHook gettext libtool makeWrapper texinfo ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ gettext libtool makeWrapper texinfo ]; meta = with stdenv.lib; { description = "A cross-platform file change monitor with multiple backends"; diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index 4ea939b0156..ca8d0c6f717 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; # configure script looks for d-bus but it is only needed for tests - buildInputs = [ glib bison flex pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib bison flex ]; meta = { description = "Preprocessor for making GObjects with inline C code"; diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index f552fe00566..25043f89463 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi"; }; - buildInputs = [ pkgconfig globalplatform pcsclite makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ globalplatform pcsclite makeWrapper ]; postFixup = '' wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib" diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 2641a1ed04f..71e9ee27a9e 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; - buildInputs = [ gtk2 pkgconfig hicolor_icon_theme ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 hicolor_icon_theme ]; meta = { homepage = http://gtkdialog.googlecode.com/; diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index 8449cf9b6f3..d1415569ca3 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz"; }; - buildInputs = [ bison flex gperf ncurses pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bison flex gperf ncurses ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index 5cf8b664941..45dd86db41b 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1"; }; - buildInputs = [ pkgconfig glib gtk2 popt babeltrace ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 popt babeltrace ]; meta = with stdenv.lib; { description = "Graphical trace viewer for LTTng trace files"; diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index bdc7f4f0414..cace3e7f0a9 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0bndnm3mgcqkw5dhwy5l1zri4lqvjbhbn5rxz651fkxlkhab8bhm"; }; - buildInputs = [intltool glib pkgconfig libgsf libuuid gcab bzip2]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [intltool glib libgsf libuuid gcab bzip2]; meta = with stdenv.lib; { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 3349213a741..2ab0dbd1b5f 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk"; }; - buildInputs = [ libftdi libusb1 pkgconfig hidapi ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libftdi libusb1 hidapi ]; configureFlags = [ "--enable-jtag_vpi" diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 2443c280443..cde8eae0f7f 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { setupHook = [ ./setup-hook.sh ]; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; doCheck = true; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 540db210eb4..45a31ad66f2 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "sysbench-1.0.6"; - buildInputs = [ autoreconfHook pkgconfig vim libmysql libaio ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ vim libmysql libaio ]; src = fetchFromGitHub { owner = "akopytov"; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index b0d5bcd28f7..544fc213273 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0nwcf5mh3ba0g23zw7ym73pgpfdass412k2fy67ryr9vnc709jkj"; }; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; # remove when https://github.com/universal-ctags/ctags/pull/1267 is merged patches = [ ./sed-test.patch ]; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index 84e14678924..27596878f34 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533"; }; - buildInputs = [ glib pkgconfig python scons ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib python scons ]; buildPhase = "scons prefix=$out"; installPhase = "scons prefix=$out install"; diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index ac87870eb59..dc447465b23 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { --replace "/bin/cp" "${coreutils}/bin/cp" ''; - buildInputs = [ binutils zlib popt pkgconfig linuxHeaders libiberty_static ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ binutils zlib popt linuxHeaders libiberty_static ] ++ stdenv.lib.optionals withGUI [ qt4 ]; configureFlags = [ diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 4be334e20ed..001560df0a0 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1wb4d844rsy8qjg3z5m6rnfm72da4xwzrrkkb1q5r10sq1pkrw5s"; }; - buildInputs = [ binutils pkgconfig gtk2 glib pango libglade ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ binutils gtk2 glib pango libglade ]; meta = { homepage = http://sysprof.com/; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index a16bdbc539a..89a1b5fe0aa 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -14,7 +14,8 @@ let stapBuild = stdenv.mkDerivation { name = "systemtap-${version}"; src = fetchgit { inherit url rev sha256; }; - buildInputs = [ elfutils pkgconfig gettext python2 pythonPackages.setuptools ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ elfutils gettext python2 pythonPackages.setuptools ]; # FIXME: Workaround for bug in kbuild, where quoted -I"/foo" flags would get mangled in out-of-tree kbuild dirs postPatch = '' substituteInPlace buildrun.cxx --replace \ diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index f2b7d67915a..2d36b09adb3 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "072ylscp0ppgii1k5j07hhv7dfmni4vyhxnsvxmgqgfyq9ldjsan"; }; - buildInputs = [ pkgconfig glib libsigrok libsigrokdecode ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libsigrok libsigrokdecode ]; meta = with stdenv.lib; { description = "Command-line frontend for the sigrok signal analysis software suite"; diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index c4dd8725a1c..e3dda509427 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" ''; - buildInputs = [ which git avrbinutils avrgcc avrlibc libelf pkgconfig freeglut mesa ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which git avrbinutils avrgcc avrlibc libelf freeglut mesa ]; meta = with stdenv.lib; { description = "A lean and mean Atmel AVR simulator"; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 9028a796381..a5625c225df 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -10,7 +10,8 @@ buildGoPackage rec { goPackagePath = "github.com/projectatomic/skopeo"; excludedPackages = "integration"; - buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs pkgconfig ostree ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree ]; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix index 43256024254..59252a93863 100644 --- a/pkgs/development/tools/sunxi-tools/default.nix +++ b/pkgs/development/tools/sunxi-tools/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "02pqaaahra4wbv325264qh5i17mxwicmjx9nm33nw2dpmfmg9xhr"; }; - buildInputs = [ pkgconfig libusb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb ]; buildPhase = '' make all misc |