Separate nativeBuildInputs where maintainers |= nckx

This commit is contained in:
Tobias Geerinckx-Rice 2015-06-17 19:36:06 +02:00
parent d4fc2b4d99
commit 98b2d7b727
30 changed files with 61 additions and 39 deletions

View File

@ -27,7 +27,8 @@ let
owner = "neovim";
};
buildInputs = [ libtool perl ];
buildInputs = [ perl ];
nativeBuildInputs = [ libtool ];
makeFlags = [ "PREFIX=$(out)" ]
++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
@ -66,8 +67,6 @@ let
enableParallelBuilding = true;
buildInputs = [
makeWrapper
cmake
glib
libtermkey
libuv
@ -79,12 +78,14 @@ let
libmsgpack
ncurses
neovimLibvterm
pkgconfig
unibilium
] ++ optional withJemalloc jemalloc;
nativeBuildInputs = [
cmake
gettext
makeWrapper
pkgconfig
];
LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so";
@ -136,7 +137,7 @@ let
in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation rec {
name = "neovim-${version}-configured";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
mkdir -p $out/bin
for item in ${neovim}/bin/*; do

View File

@ -11,7 +11,8 @@ stdenv.mkDerivation {
owner = "apitrace";
};
buildInputs = [ cmake python libX11 qt4 ];
buildInputs = [ python libX11 qt4 ];
nativeBuildInputs = [ cmake ];
buildPhase = ''
cmake

View File

@ -26,8 +26,9 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ cairo colord glib gtk3 intltool itstool libxml2 makeWrapper
pkgconfig saneBackends systemd vala ];
buildInputs = [ cairo colord glib gtk3 intltool itstool libxml2
saneBackends systemd vala ];
nativeBuildInputs = [ makeWrapper pkgconfig ];
enableParallelBuilding = true;

View File

@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ cups libssh libXpm nxproxy openldap makeWrapper qt4 ];
buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ];
nativeBuildInputs [ makeWrapper ];
patchPhase = ''
substituteInPlace Makefile \

View File

@ -28,8 +28,9 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ cmake coreutils dbus freetype glib gnused libpthreadstubs
pango pkgconfig libpulseaudio which ];
buildInputs = [ coreutils dbus freetype glib gnused libpthreadstubs
pango libpulseaudio which ];
nativeBuildInputs = [ cmake pkgconfig ];
postPatch = ''
for i in squeak.in squeak.sh.in; do

View File

@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ gcc49 icmake libmilter libX11 openssl readline utillinux
yodl ];
buildInputs = [ gcc49 libmilter libX11 openssl readline utillinux ];
nativeBuildInputs = [ icmake yodl ];
postPatch = ''
substituteInPlace INSTALL.im --replace /usr $out

View File

@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "0zcwjav1qgr7ikmvfmy7g3nc7s1kj4j4939d18mpyha9mwy4mv6r";
};
buildInputs = [ pkgconfig libmnl ];
buildInputs = [ libmnl ];
propagatedBuildInputs = [ libnfnetlink ];
nativeBuildInputs = [ pkgconfig ];
meta = with stdenv.lib; {
description = "Userspace library providing an API to the in-kernel connection tracking state table";

View File

@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ autoreconfHook icu libxslt pkgconfig ];
buildInputs = [ icu libxslt ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
configureFlags = "--disable-static --enable-man";

View File

@ -17,7 +17,8 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ autoreconfHook libjpeg libpng12 libX11 zlib ];
buildInputs = [ libjpeg libpng12 libX11 zlib ];
nativeBuildInputs = [ autoreconfHook ];
preAutoreconf = ''
cd nxcomp/

View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44";
};
buildInputs = [ perl ];
nativeBuildInputs = [ perl ];
enableParallelBuilding = true;

View File

@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ bobcat gcc49 icmake yodl ];
buildInputs = [ bobcat gcc49 ];
nativeBuildInputs = [ icmake yodl ];
postPatch = ''
substituteInPlace INSTALL.im --replace /usr $out

View File

@ -13,8 +13,9 @@ in stdenv.mkDerivation rec {
sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v";
};
buildInputs = [ flac gtk libvorbis libvpx mesa pkgconfig SDL2 SDL2_mixer ]
buildInputs = [ flac gtk libvorbis libvpx mesa SDL2 SDL2_mixer ]
++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
nativeBuildInputs = [ pkgconfig ];
postPatch = ''
substituteInPlace build/src/glbuild.c \

View File

@ -139,9 +139,11 @@ stdenv.mkDerivation {
pythonPackages.wrapPython
saneBackends
dbus
pkgconfig
net_snmp
] ++ stdenv.lib.optional qtSupport qt4;
nativeBuildInputs = [
pkgconfig
];
pythonPath = with pythonPackages; [
dbus

View File

@ -11,7 +11,8 @@ stdenv.mkDerivation {
owner = "clbr";
};
buildInputs = [ pkgconfig gettext ncurses libdrm libpciaccess ];
buildInputs = [ ncurses libdrm libpciaccess ];
nativeBuildInputs = [ pkgconfig gettext ];
enableParallelBuilding = true;

View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir $out

View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir $out

View File

@ -21,7 +21,8 @@ stdenv.mkDerivation {
./0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch
];
buildInputs = [ autoreconfHook libxcomp ];
buildInputs = [ libxcomp ];
nativeBuildInputs = [ autoreconfHook ];
preAutoreconf = ''
cd nxproxy/

View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "jmacd";
};
buildInputs = [ autoreconfHook ];
nativeBuildInputs = [ autoreconfHook ];
postPatch = ''
cd xdelta3

View File

@ -34,7 +34,8 @@ in stdenv.mkDerivation {
patches = [ ./work-around-API-borkage.patch ];
buildInputs = [ curl fuse libxml2 pkgconfig ];
buildInputs = [ curl fuse libxml2 ];
nativeBuildInputs = [ pkgconfig ];
buildFlags = "static";

View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "elmindreda";
};
buildInputs = [ autoreconfHook gettext ];
nativeBuildInputs = [ autoreconfHook gettext ];
preAutoreconf = ''
# duff is currently badly packaged, requiring us to do extra work here that

View File

@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
owner = "vgough";
};
buildInputs = [ autoreconfHook boost fuse openssl perl pkgconfig rlog ];
buildInputs = [ boost fuse openssl rlog ];
nativeBuildInputs = [ autoreconfHook perl pkgconfig ];
configureFlags = [
"--with-boost-serialization=boost_wserialization"

View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ scons ];
nativeBuildInputs = [ scons ];
buildPhase = ''
export CCFLAGS="-std=c99"

View File

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
name = "${name}.tar.gz";
};
buildInputs = [ pkgconfig fuse scons ];
buildInputs = [ fuse ];
nativeBuildInputs = [ pkgconfig scons ];
buildPhase = ''
export CCFLAGS="-O2 -Wall -std=c99 -I${fuse}/include"

View File

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
patches = [ ./fix-statfs-operation.patch ];
buildInputs = [ flac fuse lame libid3tag pkgconfig ];
buildInputs = [ flac fuse lame libid3tag ];
nativeBuildInputs = [ pkgconfig ];
enableParallelBuilding = true;

View File

@ -12,9 +12,8 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-doc";
buildInputs = [
parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 hicolor_icon_theme
];
buildInputs = [ parted gtk glib libuuid gtkmm libxml2 hicolor_icon_theme ];
nativeBuildInputs = [ intltool gettext pkgconfig ];
meta = with stdenv.lib; {
description = "Graphical disk partitioning tool";

View File

@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1110r3gpsj9xmybdw7w4zkhj3zmn5mnv2nq0ijbvrywbn019zdfs";
};
buildInputs = [ gettext ncurses ];
buildInputs = [ ncurses ];
nativeBuildInputs = [ gettext ];
makeFlags = [
"DESTDIR=$(out)"

View File

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "02r0r4lgz10ivbmgdzivj7dvry1aad75ik9vyy6irjvngjkzg5r3";
};
buildInputs = [ geoip geolite-legacy getopt openssl perl ];
buildInputs = [ geoip geolite-legacy getopt openssl ];
nativeBuildInputs = [ perl ];
patchPhase = ''
for i in {,databases/}lib/Makefile.in; do

View File

@ -33,7 +33,8 @@ stdenv.mkDerivation {
done
'';
buildInputs = [ perl zlib bzip2 xz makeWrapper ];
buildInputs = [ perl zlib bzip2 xz ];
nativeBuildInputs [ makeWrapper ];
postInstall =
''

View File

@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
owner = "Fedict";
};
buildInputs = [ autoreconfHook gtk2 pcsclite pkgconfig ];
buildInputs = [ gtk2 pcsclite ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
enableParallelBuilding = true;

View File

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "e263e6751ef7c185e278a607fdc46c207306d9a56c6ddb2ce6f58fb4464a2893";
};
buildInputs = [ jre makeWrapper pcsclite ];
buildInputs = [ jre pcsclite ];
nativeBuildInputs = [ makeWrapper ];
unpackPhase = "tar -xzf ${src} --strip-components=1";