ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-10 16:45:51 +03:00
Code Issues Projects Releases Wiki Activity

boost: Update depdendent packages

Browse Source
This commit is contained in:
William A. Kennington III 2014-09-19 10:56:08 -07:00
parent be2c1d7908
commit 31220480d8
58 changed files with 105 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/guitarix/default.nix
View File

@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
avahi boost eigen fftw gettext glib glibmm gtk gtkmm intltool jack2
ladspaH librdf libsndfile lilv lv2 pkgconfig python serd sord sratom
avahi boost boost.lib eigen fftw gettext glib glibmm gtk gtkmm intltool
jack2 ladspaH librdf libsndfile lilv lv2 pkgconfig python serd sord sratom
];
configurePhase = "python waf configure --prefix=$out";

2
pkgs/applications/audio/ingen/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
boost ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python
boost boost.lib ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python
raul serd sord sratom suil
];

2
pkgs/applications/audio/pamixer/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "03r0sbfj85wp6yxa87pjg69ivmk0mxxa2nykr8gf2c607igmb034";
};
buildInputs = [ pulseaudio boost ];
buildInputs = [ pulseaudio boost boost.lib ];
installPhase = ''
mkdir -p $out/bin

6
pkgs/applications/audio/yoshimi/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk
, jack2, libsndfile, mesa, minixml, pkgconfig, zlib
, jack2, libsndfile, mesa, minixml, pkgconfig, zlib, xorg
}:
assert stdenv ? glibc;
@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib boost cairo fftwSinglePrec fltk jack2 libsndfile mesa
minixml zlib
alsaLib boost boost.lib cairo fftwSinglePrec fltk jack2 libsndfile mesa
minixml zlib xorg.libpthreadstubs
];
nativeBuildInputs = [ cmake pkgconfig ];

2
pkgs/applications/graphics/freecad/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
zlib python swig gfortran soqt libf2c makeWrapper matplotlib
boost.lib zlib python swig gfortran soqt libf2c makeWrapper matplotlib
pycollada pyside pysideShiboken
];

4
pkgs/applications/graphics/k3d/default.nix
View File

@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
buildInputs = [
cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng
boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext
intltool perl
boost boost.lib doxygen cairomm pkgconfig imagemagick libjpeg libtiff
gettext intltool perl
gtkmm glibmm gtkglext pangox_compat libXmu
];

2
pkgs/applications/graphics/luminance-hdr/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
buildInputs = [ qt5 boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ];
buildInputs = [ qt5 boost boost.lib exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ];
nativeBuildInputs = [ cmake pkgconfig ];

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

@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip
boost boost.lib cmake ilmbase libjpeg libpng libtiff opencolorio openexr
unzip
];
cmakeFlags = [

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

@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
qt4 bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib pkgconfig
qt4 bison flex eigen boost boost.lib mesa glew opencsg cgal mpfr gmp glib
pkgconfig
];
configurePhase = ''

2
pkgs/applications/graphics/rapcad/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "37c7107dc4fcf8942a4ad35377c4e42e6aedfa35296e5fcf8d84882ae35087c7";
};
buildInputs = [qt4 cgal boost gmp mpfr flex bison dxflib];
buildInputs = [qt4 cgal boost boost.lib gmp mpfr flex bison dxflib];
configurePhase = ''
qmake;

4
pkgs/applications/graphics/synfigstudio/default.nix
View File

@ -26,11 +26,11 @@ let
patches = [ ./synfig-cstring.patch ];
buildInputs = [
ETL boost cairo gettext glibmm libsigcxx libtool libxmlxx pango
ETL boost boost.lib cairo gettext glibmm libsigcxx libtool libxmlxx pango
pkgconfig
];
configureFlags = [ "--with-boost-libdir=${boost}/lib" ];
configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ];
};
in
stdenv.mkDerivation rec {

2
pkgs/applications/misc/blender/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ SDL boost cmake ffmpeg gettext glew ilmbase libXi
[ SDL boost boost.lib cmake ffmpeg gettext glew ilmbase libXi
libjpeg libpng libsamplerate libsndfile libtiff mesa openal
opencolorio openexr openimageio /* openjpeg */ python zlib fftw
]

2
pkgs/applications/misc/freicoin/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
# I think that openssl and zlib are required, but come through other
# packages
buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip ];
buildInputs = [ db boost boost.lib gmp mpfr miniupnpc qt4 unzip ];
configurePhase = "qmake";

4
pkgs/applications/misc/gnuradio/default.nix
View File

@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
cmake pkgconfig git boost cppunit fftw python swig2 orc lxml qt4 qwt
alsaLib SDL libusb1 uhd gsl makeWrapper
cmake pkgconfig git boost boost.lib cppunit fftw python swig2 orc lxml qt4
qwt alsaLib SDL libusb1 uhd gsl makeWrapper
];
propagatedBuildInputs = [

4
pkgs/applications/misc/monero/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0bbhqjjzh922aymjqrnl2hd3r8x6p7x5aa5jidv3l4d77drhlgzy";
};
buildInputs = [ cmake boost ];
buildInputs = [ cmake boost boost.lib ];
# these tests take a long time and don't
# always complete in the build environment
@ -34,4 +34,4 @@ stdenv.mkDerivation {
maintainers = [ maintainers.emery ];
platforms = [ "x86_64-linux" ];
};
}
}

2
pkgs/applications/misc/namecoin/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# Don't build with miniupnpc due to namecoin using a different verison that
# ships with NixOS and it is API incompatible.
buildInputs = [ db4 boost openssl unzip ];
buildInputs = [ db4 boost boost.lib openssl unzip ];
patchPhase = ''
sed -e 's/-Wl,-Bstatic//g' -e 's/-l gthread-2.0//g' -e 's/-l z//g' -i src/Makefile

2
pkgs/applications/misc/namecoin/qt.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
# Don't build with miniupnpc due to namecoin using a different verison that
# ships with NixOS and it is API incompatible.
buildInputs = [ db4 boost openssl unzip qt4 ];
buildInputs = [ db4 boost boost.lib openssl unzip qt4 ];
configurePhase = ''
qmake USE_UPNP=-

2
pkgs/applications/misc/twmn/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1jd2y0ydcpjdmjbx77lw35710sqfwbgyrnpv66mi3gwvrbyiwpf3";
};
buildInputs = [ qt4 pkgconfig boost ];
buildInputs = [ qt4 pkgconfig boost boost.lib ];
propagatedBuildInputs = [ dbus ];
configurePhase = "qmake";

9
pkgs/applications/networking/instant-messengers/ekiga/default.nix
View File

@ -16,9 +16,10 @@ stdenv.mkDerivation rec {
perl perlXMLParser evolution_data_server gnome_doc_utils avahi
libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite
gnome3.libsoup glib gnome3.gnome_icon_theme_symbolic
hicolor_icon_theme gnome3.gnome_icon_theme boost autoreconfHook
pkgconfig libxml2 videoproto unixODBC db nspr nss zlib libsecret
libXrandr randrproto which libxslt libtasn1 gmp nettle makeWrapper ];
hicolor_icon_theme gnome3.gnome_icon_theme boost boost.lib
autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr
nss zlib libsecret libXrandr randrproto which libxslt libtasn1
gmp nettle makeWrapper ];
preAutoreconf = ''
substituteInPlace configure.ac --replace AM_GCONF_SOURCE_2 ""
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-ldap-dir=${openldap}"
"--with-libsasl2-dir=${cyrus_sasl}"
"--with-boost-libdir=${boost}/lib"
"--with-boost-libdir=${boost.lib}/lib"
"--disable-gconf"
];

2
pkgs/applications/networking/instant-messengers/twinkle/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
configureFlags = "--with-extra-includes=${libjpeg}/include";
buildInputs =
[ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile
[ pkgconfig autoreconfHook commoncpp2 openssl boost boost.lib libsndfile
libxml2 libjpeg readline qt3 perl file
# optional ? :
alsaLib speex

2
pkgs/applications/networking/linssid/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
};
buildInputs = [ qt5 pkgconfig boost ];
buildInputs = [ qt5 pkgconfig boost boost.lib ];
postPatch = ''
sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro

2
pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf";
};
buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ];
buildInputs = [ cmake pkgconfig qt4 boost boost.lib bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ];
cmakeFlags = ''
-DUSE_ASPELL=ON

2
pkgs/applications/office/ledger/3.0.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation {
sha256 = "1yr4i8gpby67j4vl7xk109dwb14z8a424nwgva8rbms8115w4ps5";
};
buildInputs = [ cmake boost gmp mpfr libedit python texinfo gnused ];
buildInputs = [ cmake boost boost.lib gmp mpfr libedit python texinfo gnused ];
enableParallelBuilding = true;

2
pkgs/applications/science/electronics/pulseview/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1pf1dgwd9j586nqmni6gqf3qxrsmawcmi9wzqfzqkjci18xd7dgy";
};
buildInputs = [ pkgconfig cmake glib qt4 boost libsigrok
buildInputs = [ pkgconfig cmake glib qt4 boost boost.lib libsigrok
libsigrokdecode libserialport libzip udev libusb1 libftdi
];

2
pkgs/applications/science/logic/stp/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
rev = "3aa11620a823d617fc033d26aedae91853d18635";
sha256 = "832520787f57f63cf47364d080f30ad10d6d6e00f166790c19b125be3d6dd45c";
};
buildInputs = [ cmake boost bison flex perl zlib ];
buildInputs = [ cmake boost boost.lib bison flex perl zlib ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
patchPhase = ''
sed -e 's,^export(PACKAGE.*,,' -i CMakeLists.txt

5
pkgs/applications/version-management/gource/default.nix
View File

@ -12,10 +12,11 @@ stdenv.mkDerivation rec {
};
buildInputs = [
glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boost glm
glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa
boost boost.lib glm
];
configureFlags = "--with-boost-libdir=${boost}/lib";
configureFlags = "--with-boost-libdir=${boost.lib}/lib";
NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions

4
pkgs/applications/video/aegisub/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool ];
buildInputs = with stdenv.lib;
[ libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib icu boost ]
[ libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib icu boost boost.lib ]
++ optional spellChecking hunspell
++ optional automationSupport lua
++ optional openalSupport openal
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm -lGL";
configureFlags = "--with-boost-libdir=${boost}/lib/";
configureFlags = "--with-boost-libdir=${boost.lib}/lib/";
postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub";

2
pkgs/applications/video/gnash/default.nix
View File

@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good
gst_ffmpeg speex libtool
libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
libogg libxml2 libjpeg mesa libpng libungif boost boost.lib freetype agg
dbus curl pkgconfig glib gtk gtkglext pangox_compat
xulrunner
makeWrapper

2
pkgs/desktops/kde-4.12/kde-workspace.nix
View File

@ -20,7 +20,7 @@ kde {
xorg.libxkbfile xorg.libXcomposite xorg.libXtst
xorg.libXdamage
python boost qjson lm_sensors gpsd libraw1394 pciutils udev
python boost boost.lib qjson lm_sensors gpsd libraw1394 pciutils udev
akonadi pam libusb1 libqalculate kdepimlibs prison
kactivities
];

2
pkgs/desktops/kde-4.12/kdebindings/pykde4.nix
View File

@ -9,7 +9,7 @@ kde {
buildInputs = [
python kdepimlibs shared_desktop_ontologies
boost polkit_qt_1
boost boost.lib polkit_qt_1
];
nativeBuildInputs = [ pkgconfig ];

2
pkgs/desktops/kde-4.12/kdeedu/kig.nix
View File

@ -1,6 +1,6 @@
{ kde, kdelibs, boost, python}:
kde {
buildInputs = [ kdelibs boost python ];
buildInputs = [ kdelibs boost boost.lib python ];
cmakeFlags = "-DKIG_ENABLE_PYTHON_SCRIPTING=1";
meta = {

6
pkgs/desktops/kde-4.12/kdeedu/rocs.nix
View File

@ -1,7 +1,9 @@
{ kde, kdelibs, boost, grantlee }:
let
boostpkg = boost.override { enableExceptions = true; };
in
kde {
buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ];
buildInputs = [ kdelibs boostpkg boostpkg.lib grantlee ];
NIX_CFLAGS_COMPILE = "-fexceptions";

2
pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix
View File

@ -1,7 +1,7 @@
{ kde, kdelibs, boost }:
kde {
buildInputs = [ kdelibs boost ];
buildInputs = [ kdelibs boost boost.lib ];
meta = {
description = "Strigi analyzers for various network protocols";

2
pkgs/desktops/kde-4.12/kdenetwork/kget.nix
View File

@ -8,7 +8,7 @@ kde {
buildInputs =
[ kdelibs libktorrent nepomuk_core nepomuk_widgets sqlite qca2
libmms kde_baseapps kde_workspace boost ];
libmms kde_baseapps kde_workspace boost boost.lib ];
nativeBuildInputs = [ pkgconfig ];

2
pkgs/desktops/kde-4.12/kdenetwork/kopete.nix
View File

@ -10,7 +10,7 @@ kde {
buildInputs = [
kdelibs qca2 mediastreamer libgadu jsoncpp
kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib
libidn libxslt boost
libidn libxslt boost boost.lib
ortp srtp libv4l
];

2
pkgs/desktops/kde-4.12/kdepim-runtime.nix
View File

@ -5,7 +5,7 @@ kde {
# TODO: libkgapi(2), LibKFbAPI,libkolab, libkolabxml
buildInputs = [
kdepimlibs akonadi boost shared_desktop_ontologies
kdepimlibs akonadi boost boost.lib shared_desktop_ontologies
libxslt
];

4
pkgs/desktops/kde-4.12/kdeplasma-addons.nix
View File

@ -9,8 +9,8 @@ kde {
KDEDIRS=marble;
buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
eigen qca2 libXtst qimageblitz libqalculate
buildInputs = [ kdelibs boost boost.lib kde_workspace kdepimlibs attica qjson
qoauth eigen qca2 libXtst qimageblitz libqalculate
shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
];

2
pkgs/desktops/kde-4.12/kdesdk/umbrello.nix
View File

@ -1,7 +1,7 @@
{ kde, kdelibs, libxml2, libxslt, boost }:
kde {
buildInputs = [ kdelibs libxml2 libxslt boost ];
buildInputs = [ kdelibs libxml2 libxslt boost boost.lib ];
meta = {
description = "Umbrello UML modeller";

2
pkgs/desktops/kde-4.12/kdeutils/kgpg.nix
View File

@ -2,7 +2,7 @@
kde {
buildInputs = [ kdelibs kdepimlibs boost ];
buildInputs = [ kdelibs kdepimlibs boost boost.lib ];
meta = {
description = "Simple KDE GUI for GPG";

2
pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix
View File

@ -4,7 +4,7 @@ kde {
# todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old
buildInputs = [ kdelibs kdepimlibs htmlTidy boost ];
buildInputs = [ kdelibs kdepimlibs htmlTidy boost boost.lib ];
meta = {
description = "A KDE link checker";

2
pkgs/desktops/kde-4.12/support/akonadi/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0k96i8xq3xkm5rrxrj3zqgppcmqbzcpc918xnx0p54jkkm85gchc";
};
buildInputs = [ qt4 soprano libxslt boost sqlite ];
buildInputs = [ qt4 soprano libxslt boost boost.lib sqlite ];
nativeBuildInputs = [ cmake automoc4 shared_mime_info ];

6
pkgs/development/compilers/hhvm/default.nix
View File

@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ cmake pkgconfig boost libunwind mariadb libmemcached pcre libevent gd curl
libxml2 icu flex bison openssl zlib php expat libcap oniguruma
libdwarf libmcrypt tbb gperftools bzip2 openldap readline
[ cmake pkgconfig boost boost.lib libunwind mariadb libmemcached pcre
libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml
];

2
pkgs/development/libraries/CGAL/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1s0ylyrx74vgw6vsg6xxk4b07jrxh8pqcmxcbkx46v01nczv3ixj";
};
buildInputs = [ cmake boost gmp mpfr ];
buildInputs = [ cmake boost boost.lib gmp mpfr ];
doCheck = false;

5
pkgs/development/libraries/botan/default.nix
View File

@ -9,8 +9,9 @@ let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
buildInputs = [ boost.lib ]
++ map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="botan";
tarBaseName="Botan";

5
pkgs/development/libraries/botan/unstable.nix
View File

@ -9,8 +9,9 @@ let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
buildInputs = [ boost.lib ]
++ map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="botan";
tarBaseName="Botan";

10
pkgs/development/libraries/cpp-netlib/default.nix
View File

@ -12,17 +12,17 @@ stdenv.mkDerivation rec {
md5 = "0765cf203f451394df98e6ddf7bf2541";
};
buildInputs = [ cmake boost openssl ];
buildInputs = [ cmake boost boost.lib openssl ];
cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=RELEASE" ];
enableParallelBuilding = true;
meta = {
meta = with stdenv.lib; {
description = "A collection of open-source libraries for high level network programming";
homepage = http://cpp-netlib.org;
license = stdenv.lib.licenses.boost;
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
license = licenses.boost;
maintainers = with maintainers; [ shlevy ];
platforms = platforms.all;
};
}

4
pkgs/development/libraries/libtorrent-rasterbar/default.nix
View File

@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "1a3yxwjs4qb0rwx6cfpvar0a8jmavb6ik580b27md08jhvq80if7";
};
buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ];
buildInputs = [ boost boost.lib pkgconfig openssl zlib python libiconvOrNull geoip ];
configureFlags = [
"--with-boost=${boost}/include/boost"
"--with-boost-libdir=${boost}/lib"
"--with-boost-libdir=${boost.lib}/lib"
"--enable-python-binding"
"--with-libgeoip=system"
"--with-libiconv=yes"

12
pkgs/games/asc/default.nix
View File

@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-fpermissive"; # I'm too lazy to catch all gcc47-related problems
buildInputs = [
SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat freetype
libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng
SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost boost.lib expat
freetype libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng
];
meta = {
meta = with stdenv.lib; {
description = "Turn based strategy game";
longDescription = ''
@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
homepage = http://www.asc-hq.org/;
license = stdenv.lib.licenses.gpl2Plus;
license = licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
maintainers = with maintainers; [ viric ];
platforms = with platforms; linux;
};
}

5
pkgs/games/globulation/default.nix
View File

@ -8,8 +8,9 @@ let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
buildInputs = [ boost.lib ]
++ map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="glob2";
version="0.9.4";

2
pkgs/games/pingus/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig
, mesa}:
let
buildInputs = [scons SDL SDL_image boost libpng SDL_mixer pkgconfig mesa];
buildInputs = [scons SDL SDL_image boost boost.lib libpng SDL_mixer pkgconfig mesa];
s = # Generated upstream information
rec {
baseName="pingus";

2
pkgs/games/spring/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
"-DPREFER_STATIC_LIBS:BOOL=OFF"];
buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL
buildInputs = [ cmake lzma boost boost.lib libdevil zlib p7zip openal libvorbis freetype SDL
xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper
docbook_xsl_ns systemd ]
++ stdenv.lib.optional withAI jdk

4
pkgs/games/spring/springlobby.nix
View File

@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost libpng libX11
libnotify gtk doxygen makeWrapper
cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar
boost boost.lib libpng libX11 libnotify gtk doxygen makeWrapper
];
prePatch = ''

5
pkgs/games/wesnoth/default.nix
View File

@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "0gi5fzij48hmhhqxc370jxvxig5q3d70jiz56rjn8yx514s5lfwa";
};
buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi
cmake freetype libpng pkgconfig lua dbus fontconfig libtool ];
buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib
boost boost.lib fribidi cmake freetype libpng pkgconfig lua
dbus fontconfig libtool ];
cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030

2
pkgs/servers/amqp/qpid-cpp/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1c03yi19d5h5h78h37add9csmy0mzvvmvn7zkcalwszabdhsb5yk";
};
buildInputs = [ cmake python boost libuuid ruby ];
buildInputs = [ cmake python boost boost.lib libuuid ruby ];
# the subdir managementgen wants to install python stuff in ${python} and
# the installation tries to create some folders in /var

8
pkgs/servers/nosql/rethinkdb/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, which, protobuf, gperftools, boost, zlib, python, m4 }:
{ stdenv, fetchurl, which, protobuf, gperftools, boost, zlib, curl, python, m4 }:
stdenv.mkDerivation rec {
name = "rethinkdb-1.12.4";
name = "rethinkdb-1.14.1";
src = fetchurl {
url = "http://download.rethinkdb.com/dist/${name}.tgz";
sha256 = "1dq2vbgms016ic2hifclm1m58i4804khkn0lnvz47rkm7i0564if";
sha256 = "0brsbb289hcsmipma4rsgrkqpqagwff2y6w46dvb25n95id65hx8";
};
preConfigure = ''
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
configureFlags = "--lib-path ${gperftools}/lib";
buildInputs = [ protobuf zlib boost ];
buildInputs = [ protobuf boost boost.lib zlib curl ];
nativeBuildInputs = [ which m4 python ];

8
pkgs/servers/rippled/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, scons, pkgconfig, openssl, protobuf, boost155, zlib}:
{ stdenv, fetchurl, scons, pkgconfig, openssl, protobuf, boost, zlib}:
stdenv.mkDerivation rec {
name = "rippled-${version}";
@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
patches = [ ./scons-env.patch ];
buildInputs = [ scons pkgconfig openssl protobuf boost155 zlib ];
buildInputs = [ scons pkgconfig openssl protobuf boost zlib ];
RIPPLED_BOOST_HOME = boost155.out;
RIPPLED_BOOST_HOME = boost.out;
RIPPLED_ZLIB_HOME = zlib.out;
buildPhase = "scons build/rippled";
@ -29,4 +29,4 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.isc;
platforms = stdenv.lib.platforms.linux;
};
}
}

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

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "f2b978cc93a2d16262c7b78c62019b2a58044eaef4ca95feaa74dfd4dfcbfa36";
};
buildInputs = [cmake libgcrypt json_c curl expat stdenv binutils boost];
buildInputs = [cmake libgcrypt json_c curl expat stdenv binutils boost boost.lib];
# work around new binutils headers, see
# http://stackoverflow.com/questions/11748035/binutils-bfd-h-wants-config-h-now

2
pkgs/tools/security/meo/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
buildFlags = "QMAKE=qmake";
buildInputs = [ openssl pcre qt4 boost pkcs11helper ];
buildInputs = [ openssl pcre qt4 boost boost.lib pkcs11helper ];
preConfigure = ''
sed -i s,-mt$,, meo-gui/meo-gui.pro