public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Separate nativeBuildInputs where maintainers |= nckx

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/editors/neovim/default.nix
View File

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

3
pkgs/applications/graphics/apitrace/default.nix
View File

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

5
pkgs/applications/graphics/simple-scan/default.nix
View File

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

3
pkgs/applications/networking/remote/x2goclient/default.nix
View File

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

5
pkgs/development/compilers/squeak/default.nix
View File

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

4
pkgs/development/libraries/bobcat/default.nix
View File

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

3
pkgs/development/libraries/libnetfilter_conntrack/default.nix
View File

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

3
pkgs/development/libraries/libpsl/default.nix
View File

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

3
pkgs/development/libraries/libxcomp/default.nix
View File

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

2
pkgs/development/tools/analysis/coan/default.nix
View File

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

3
pkgs/development/tools/parsing/flexc++/default.nix
View File

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

3
pkgs/games/eduke32/default.nix
View File

@ -13,8 +13,9 @@ in stdenv.mkDerivation rec {
sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v"; 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; ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
nativeBuildInputs = [ pkgconfig ];
postPatch = '' postPatch = ''
substituteInPlace build/src/glbuild.c \ substituteInPlace build/src/glbuild.c \

4
pkgs/misc/drivers/hplip/default.nix
View File

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

3
pkgs/os-specific/linux/radeontop/default.nix
View File

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

2
pkgs/servers/nosql/cassandra/2.0.nix
View File

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

2
pkgs/servers/nosql/cassandra/2.1.nix
View File

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

3
pkgs/tools/admin/nxproxy/default.nix
View File

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

2
pkgs/tools/compression/xdelta/default.nix
View File

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

3
pkgs/tools/filesystems/boxfs/default.nix
View File

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

2
pkgs/tools/filesystems/duff/default.nix
View File

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

3
pkgs/tools/filesystems/encfs/default.nix
View File

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

2
pkgs/tools/filesystems/exfat-utils/default.nix
View File

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

3
pkgs/tools/filesystems/fuse-exfat/default.nix
View File

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

3
pkgs/tools/filesystems/mp3fs/default.nix
View File

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

5
pkgs/tools/misc/gparted/default.nix
View File

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

3
pkgs/tools/networking/httping/default.nix
View File

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

3
pkgs/tools/networking/ipv6calc/default.nix
View File

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

3
pkgs/tools/package-management/dpkg/default.nix
View File

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

3
pkgs/tools/security/eid-mw/default.nix
View File

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

3
pkgs/tools/security/eid-viewer/default.nix
View File

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