diff options
58 files changed, 105 insertions, 95 deletions
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index e593ddf41e6..3a125ef665d 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -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"; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index ac46ff6140c..121b6d2c266 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index d273c238177..769af20c0ed 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "03r0sbfj85wp6yxa87pjg69ivmk0mxxa2nykr8gf2c607igmb034"; }; - buildInputs = [ pulseaudio boost ]; + buildInputs = [ pulseaudio boost boost.lib ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 67edc7f521d..bc28108b7cb 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -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 ]; diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index a7665177046..0235f892b8d 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -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 ]; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 6a66685e42b..e7d337d7b1f 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -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 ]; diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 7558b0aef4b..7f2d3e24589 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -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 ]; diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index d0a1fb38e0c..ef88ec60411 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -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 = [ diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index d831df5d7b6..67611d2f67c 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -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 = '' diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index 2ff82412409..b314bdaf6ba 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -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; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index ba7a916e3fe..59ca7b7374d 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -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 { diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 24a3fcd4cea..28555d910af 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -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 ] diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix index 65265fc07a5..06ea5e9ad5c 100644 --- a/pkgs/applications/misc/freicoin/default.nix +++ b/pkgs/applications/misc/freicoin/default.nix @@ -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"; diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 19455f972a5..db8595e1baa 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -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 = [ diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix index 30abcdb74b2..52e8d20495b 100644 --- a/pkgs/applications/misc/monero/default.nix +++ b/pkgs/applications/misc/monero/default.nix @@ -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" ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/namecoin/default.nix b/pkgs/applications/misc/namecoin/default.nix index b1bd401b2eb..71c8c589380 100644 --- a/pkgs/applications/misc/namecoin/default.nix +++ b/pkgs/applications/misc/namecoin/default.nix @@ -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 diff --git a/pkgs/applications/misc/namecoin/qt.nix b/pkgs/applications/misc/namecoin/qt.nix index 447a2b42b6b..ac721b955a5 100644 --- a/pkgs/applications/misc/namecoin/qt.nix +++ b/pkgs/applications/misc/namecoin/qt.nix @@ -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=- diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 65c2ccb5ff0..e144d12f762 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1jd2y0ydcpjdmjbx77lw35710sqfwbgyrnpv66mi3gwvrbyiwpf3"; }; - buildInputs = [ qt4 pkgconfig boost ]; + buildInputs = [ qt4 pkgconfig boost boost.lib ]; propagatedBuildInputs = [ dbus ]; configurePhase = "qmake"; diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index a00a68ff9f2..41bd4ca4513 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -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" ]; diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index c7f33c1f580..961ab997384 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -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 diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 2b4c5f564be..00ff1110c32 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -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 diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index e4ca6d423cd..ba71e1985b4 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -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 diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix index 21f77ea1ea4..eb01556fc68 100644 --- a/pkgs/applications/office/ledger/3.0.nix +++ b/pkgs/applications/office/ledger/3.0.nix @@ -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; diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index 07724d93254..f9369efe96e 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -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 ]; diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index cfe96bc6983..109d9fe3d4b 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -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 diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index afe0ac71ea4..74eee477847 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -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 diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index a2089e04e70..3a152de2d0b 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -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"; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 515e2591461..879fa08ea38 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -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 diff --git a/pkgs/desktops/kde-4.12/kde-workspace.nix b/pkgs/desktops/kde-4.12/kde-workspace.nix index 537beaac6ae..38e28225d94 100644 --- a/pkgs/desktops/kde-4.12/kde-workspace.nix +++ b/pkgs/desktops/kde-4.12/kde-workspace.nix @@ -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 ]; diff --git a/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix index 64e196452e3..b298cdbc816 100644 --- a/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix +++ b/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix @@ -9,7 +9,7 @@ kde { buildInputs = [ python kdepimlibs shared_desktop_ontologies - boost polkit_qt_1 + boost boost.lib polkit_qt_1 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/kde-4.12/kdeedu/kig.nix b/pkgs/desktops/kde-4.12/kdeedu/kig.nix index 37906c32bcb..fb442e2ef62 100644 --- a/pkgs/desktops/kde-4.12/kdeedu/kig.nix +++ b/pkgs/desktops/kde-4.12/kdeedu/kig.nix @@ -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 = { diff --git a/pkgs/desktops/kde-4.12/kdeedu/rocs.nix b/pkgs/desktops/kde-4.12/kdeedu/rocs.nix index ce30d11fda3..135598ded90 100644 --- a/pkgs/desktops/kde-4.12/kdeedu/rocs.nix +++ b/pkgs/desktops/kde-4.12/kdeedu/rocs.nix @@ -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"; diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix index e838d84fc5e..9a76863c8e0 100644 --- a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix +++ b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix @@ -1,7 +1,7 @@ { kde, kdelibs, boost }: kde { - buildInputs = [ kdelibs boost ]; + buildInputs = [ kdelibs boost boost.lib ]; meta = { description = "Strigi analyzers for various network protocols"; diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kget.nix b/pkgs/desktops/kde-4.12/kdenetwork/kget.nix index f986da2de21..d7527ca6a60 100644 --- a/pkgs/desktops/kde-4.12/kdenetwork/kget.nix +++ b/pkgs/desktops/kde-4.12/kdenetwork/kget.nix @@ -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 ]; diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix index 7d8aec21ce6..e8eab764419 100644 --- a/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix +++ b/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix @@ -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 ]; diff --git a/pkgs/desktops/kde-4.12/kdepim-runtime.nix b/pkgs/desktops/kde-4.12/kdepim-runtime.nix index d92e2254820..484d3e1933a 100644 --- a/pkgs/desktops/kde-4.12/kdepim-runtime.nix +++ b/pkgs/desktops/kde-4.12/kdepim-runtime.nix @@ -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 ]; diff --git a/pkgs/desktops/kde-4.12/kdeplasma-addons.nix b/pkgs/desktops/kde-4.12/kdeplasma-addons.nix index 550099830d9..afc925c79aa 100644 --- a/pkgs/desktops/kde-4.12/kdeplasma-addons.nix +++ b/pkgs/desktops/kde-4.12/kdeplasma-addons.nix @@ -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 ]; diff --git a/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix index e83a2d9a901..2dbccdef945 100644 --- a/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix +++ b/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix @@ -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"; diff --git a/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix index 3ff1a286ae5..11b62f499a4 100644 --- a/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix +++ b/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix @@ -2,7 +2,7 @@ kde { - buildInputs = [ kdelibs kdepimlibs boost ]; + buildInputs = [ kdelibs kdepimlibs boost boost.lib ]; meta = { description = "Simple KDE GUI for GPG"; diff --git a/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix index 918512e2b2d..36630ef8fc6 100644 --- a/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix +++ b/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix @@ -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"; diff --git a/pkgs/desktops/kde-4.12/support/akonadi/default.nix b/pkgs/desktops/kde-4.12/support/akonadi/default.nix index d51996e3bc1..824fd3e6616 100644 --- a/pkgs/desktops/kde-4.12/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.12/support/akonadi/default.nix @@ -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 ]; diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index d2f24390318..1873b58e802 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 4c2739d00ec..512a17e6d3e 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1s0ylyrx74vgw6vsg6xxk4b07jrxh8pqcmxcbkx46v01nczv3ixj"; }; - buildInputs = [ cmake boost gmp mpfr ]; + buildInputs = [ cmake boost boost.lib gmp mpfr ]; doCheck = false; diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 64dd821c43f..e603b904dda 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -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"; diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index 677172dd3ac..be541a1d8ec 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -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"; diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index 43849bf8ed8..3ce9dc38b3c 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -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; }; } diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 0745313b41e..becca407ce9 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -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" diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index 93297171bcb..41c527f462c 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -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; }; } diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index f1ffec85566..7ac83d512b3 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -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"; diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 43cdc2031bf..af635379ac8 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -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"; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 69387f0cfd3..1c26dde00a9 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -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 diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 35fdbc0a19e..5305759369b 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -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 = '' diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index f279127b62b..c1c1b5b0756 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -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 diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 69c0a3dff41..6a71994091d 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -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 diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 3694547c2d9..79fd61390e4 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -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 ]; diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 1325cebae40..d930c5b6a97 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -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; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix index c6d2776f437..559e2ae4c51 100644 --- a/pkgs/tools/filesystems/grive/default.nix +++ b/pkgs/tools/filesystems/grive/default.nix @@ -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 diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix index be678b18dda..051b6579f17 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -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 |