diff options
Diffstat (limited to 'pkgs/development')
14 files changed, 33 insertions, 39 deletions
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index b41fa8a77c4d9..af728b942ebb8 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -47,10 +47,9 @@ in stdenv.mkDerivation ({ inherit src version; - nativeBuildInputs = [ autoreconfHook makeWrapper perl ]; + nativeBuildInputs = [ autoreconfHook makeWrapper perl gnum4 libxslt libxml2 ]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ gnum4 ncurses openssl libxslt libxml2 ] + buildInputs = [ ncurses openssl ] ++ optionals wxSupport wxPackages2 ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 9e9a99e52879a..b196af8e3ae4c 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -32,9 +32,8 @@ let build = {flags, target}: stdenv.mkDerivation rec { name = "pixie-${version}"; version = "0-r${commit-count}-${variant}"; - nativeBuildInputs = libs; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = libs; PYTHON = if buildWithPypy then "${pypy}/pypy-c/.pypy-c-wrapped" else "${python2.interpreter}"; diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 418ee90533f17..9a14beb856b67 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -11,9 +11,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isArm autoconf213; buildInputs = [ perl python2 zip ]; - nativeBuildInputs = if stdenv.isArm then [ autoconf213 ] else []; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 7279d5c383c42..fc533c277bb08 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -16,9 +16,8 @@ stdenv.mkDerivation { inherit (s) url sha256; }; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl pkgconfig ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib libjpeg freetype giflib libpng ] ++ stdenv.lib.optional enableSDL SDL ++ stdenv.lib.optionals enableX11 (with xorg; [ diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index bd12dac4aafb3..240f3c136ef58 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libosip openssl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix index c723885a68bf5..5efa378ff5fa3 100644 --- a/pkgs/development/libraries/fflas-ffpack/1.nix +++ b/pkgs/development/libraries/fflas-ffpack/1.nix @@ -7,9 +7,8 @@ stdenv.mkDerivation rec { url = "http://linalg.org/fflas-ffpack-${version}.tar.gz"; sha256 = "02fr675278c65hfiy1chb903j4ix9i8yni1xc2g5nmsjcaf9vra9"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ givaro_3_7 openblas gmpxx]; - nativeBuildInputs = [pkgconfig]; configureFlags = "--with-blas=-lopenblas --with-gmp=${gmpxx.dev} --with-givaro=${givaro_3_7}"; meta = { inherit version; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index f1d6e47f56eb0..0e4e897e27a43 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0k1f4pb7azrm6ajncvg7vni7ixfmn6fssd5ld4xddbi6jqbsf9rd"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ givaro (liblapack.override {shared = true;}) openblas]; - nativeBuildInputs = [pkgconfig]; configureFlags = "--with-blas-libs=-lopenblas --with-lapack-libs=-llapack"; meta = { inherit version; diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix index f86f2fcf2141e..7d229d2577abf 100644 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1wlzs604mgmqmrgpk4pljx2nrlxzdfi3r8k59qlm90fx8qkqkc63"; }; - nativeBuildInputs = [ autoreconfHook ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ zeromq3 jdk ]; preConfigure = '' diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix index 4e1f0badd7a38..351ec3e773312 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix @@ -15,9 +15,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [automake autoconf libtool ]; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ boost openssl zlib python libiconv geoip ]; preConfigure = "./autotool.sh"; diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index bc5dda6cff1ba..f49b7ba2c4b4d 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -12,9 +12,8 @@ stdenv.mkDerivation rec { sha256 = "001km4xy1ifwbg1c19ncc75h867fzfcxy9pxvl4pxqb64169xc1k"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; buildInputs = [ mediastreamer openh264 ]; - nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "H.264 encoder/decoder plugin for mediastreamer2"; diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index 4bdc9503c9afe..219cda38bc28b 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -10,9 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1b5r4nd098lnjwr2g13f04ycqv5fvbrhpwg6fsdk8xy9cigvfzxj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ]; - nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--without-apxs" diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 15a9e98b04e51..8330f7f44f33a 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { name = "vulkan-loader-${version}"; inherit version src; - nativeBuildInputs = [ makeWrapper ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ cmake git python3 python3Packages.lxml glslang spirv-tools x11 libxcb libXrandr libXext wayland ]; diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index f94db1bdbe979..0513f67e56970 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -30,11 +30,12 @@ buildPythonPackage rec { tests/run/cpdef_enums.pyx ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + # For testing + numpy ncurses + ]; buildInputs = [ glibcLocales gdb ]; - # For testing - nativeBuildInputs = [ numpy ncurses ]; - LC_ALL = "en_US.UTF-8"; # cython's testsuite is not working very well with libc++ @@ -55,4 +56,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 2b0b43478aa21..52bdf2027688e 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -39,8 +39,10 @@ let in { - nativeBuildInputs = [ pkgconfig ]; - atk = attrs: { buildInputs = [ gtk2 pcre ]; }; + atk = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 pcre ]; + }; bundler = attrs: let @@ -58,7 +60,7 @@ in }; cairo = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp]; }; @@ -91,16 +93,20 @@ in buildInputs = [ gpgme ]; }; - nativeBuildInputs = [ pkgconfig ]; - gio2 = attrs: { buildInputs = [ gtk2 pcre ]; }; + gio2 = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 pcre ]; + }; gitlab-markup = attrs: { meta.priority = 1; }; - nativeBuildInputs = [ pkgconfig ]; - glib2 = attrs: { buildInputs = [ gtk2 pcre ]; }; + glib2 = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 pcre ]; + }; gtk2 = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp]; # CFLAGS must be set for this gem to detect gdkkeysyms.h correctly CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; |