diff options
Diffstat (limited to 'pkgs/development')
35 files changed, 57 insertions, 51 deletions
diff --git a/pkgs/development/compilers/gerbil/gerbil-crypto.nix b/pkgs/development/compilers/gerbil/gerbil-crypto.nix index 12f4726f1c62e..38943471a376d 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 9cb9954544c7e..f51076fd5d4d1 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 4354ce7e2d671..bcd52380701ac 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 9f6ecb2516eda..0777fb8d48baa 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 1173315192e10..74360daa87666 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 6bb1a70b86506..0ff8f0ea7fc02 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 b9756e0e1a1ad..6f38bfa0d076d 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 4f7891910a7d3..697ff1a857b3f 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 e96aa9394da91..f0b37b7e633c8 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 687b74fdb3ad9..162a64eeb5dad 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 e553efa5f2520..d722143b210e7 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 aca6ccdcccbc8..6f48ba4e26687 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 8edc3d7b5a52b..b59d3aab4a336 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 7251e5b645bee..29762e231f2d7 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 dffbcdd69d10c..f9c711df70431 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 be4cdd62f6e1b..6cff9e3f03aa9 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 81e661a942148..2d916fa9a9391 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 dba098b4468a1..077b414a665d2 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 831ff2447a21f..e726f07a7d866 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 fd7d80574a7d5..a1f54006beb58 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 9c2c213846124..f64fdbeba1da3 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 e93dfdfb144e7..2017d5435ea43 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 fd89ede1efb9a..55a1b9dcb4c97 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 eafc773ef2062..83f84d4d4fd39 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 17e91f7e23650..f26365fa8e632 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 76ce9a36c7139..54d9bad1644f7 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 ce2f7c20d3cbd..cc0049ef756c2 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 dfb76069c3b29..59f1a2cd673a6 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 92796b4116c48..4ac58c3f3d0a6 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 e5d5e11185530..1ff2101b14629 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 eacdda27f435f..4588d0c04b047 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 2ed9d860f8bbb..a8e8fee5ba7df 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 9c92764fdaf55..30ae23e85a8d8 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 405e7e7b9b073..4dc94dcf5d5a4 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 b20d172a403dc..27ff1b5e69dd6 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) |