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

boost: Remove boost.lib

Browse Source
This commit is contained in:
William A. Kennington III 2014-10-01 12:55:40 -07:00
parent ecfc1a7fc3
commit aa3e800be7
57 changed files with 52 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
alsaLib boost boost.lib cairo fftwSinglePrec fltk jack2 libsndfile mesa alsaLib boost cairo fftwSinglePrec fltk jack2 libsndfile mesa
minixml zlib xorg.libpthreadstubs minixml zlib xorg.libpthreadstubs
]; ];

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 buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
boost.lib zlib python swig gfortran soqt libf2c makeWrapper matplotlib zlib python swig gfortran soqt libf2c makeWrapper matplotlib
pycollada pyside pysideShiboken pycollada pyside pysideShiboken
]; ];

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

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

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

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

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

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

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

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

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

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

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

@ -23,10 +23,6 @@ stdenv.mkDerivation rec {
cd bitcoin* cd bitcoin*
''; '';
configureFlags = [
"--with-boost=${boost}"
];
preCheck = '' preCheck = ''
# At least one test requires writing in $HOME # At least one test requires writing in $HOME
HOME=$TMPDIR HOME=$TMPDIR

1
pkgs/applications/misc/bitcoin/dogecoin.nix
View File

@ -30,7 +30,6 @@ let
./autogen.sh \ ./autogen.sh \
&& ./configure --prefix=$out \ && ./configure --prefix=$out \
--with-incompatible-bdb \ --with-incompatible-bdb \
--with-boost-libdir=${boost}/lib \
${ if withGui then "--with-gui" else "" } ${ if withGui then "--with-gui" else "" }
''; '';

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

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

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

@ -10,10 +10,6 @@ stdenv.mkDerivation {
sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m"; sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m";
}; };
configurePhase = "./configure --prefix=\$out "
+ " --with-boost-libdir=\$boost/lib"
+ " --with-boost-includedir=\$boost/include";
buildInputs = [ gtk glib pkgconfig openssl boost ]; buildInputs = [ gtk glib pkgconfig openssl boost ];
meta = { meta = {

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 # I think that openssl and zlib are required, but come through other
# packages # packages
buildInputs = [ db boost boost.lib gmp mpfr miniupnpc qt4 unzip ]; buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip ];
configurePhase = "qmake"; configurePhase = "qmake";

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

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

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

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

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 # Don't build with miniupnpc due to namecoin using a different verison that
# ships with NixOS and it is API incompatible. # ships with NixOS and it is API incompatible.
buildInputs = [ db4 boost boost.lib openssl unzip ]; buildInputs = [ db4 boost openssl unzip ];
patchPhase = '' patchPhase = ''
sed -e 's/-Wl,-Bstatic//g' -e 's/-l gthread-2.0//g' -e 's/-l z//g' -i src/Makefile 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 # Don't build with miniupnpc due to namecoin using a different verison that
# ships with NixOS and it is API incompatible. # ships with NixOS and it is API incompatible.
buildInputs = [ db4 boost boost.lib openssl unzip qt4 ]; buildInputs = [ db4 boost openssl unzip qt4 ];
configurePhase = '' configurePhase = ''
qmake USE_UPNP=- qmake USE_UPNP=-

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

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

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

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
perl perlXMLParser evolution_data_server gnome_doc_utils avahi perl perlXMLParser evolution_data_server gnome_doc_utils avahi
libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite
gnome3.libsoup glib gnome3.gnome_icon_theme_symbolic gnome3.libsoup glib gnome3.gnome_icon_theme_symbolic
hicolor_icon_theme gnome3.gnome_icon_theme boost boost.lib hicolor_icon_theme gnome3.gnome_icon_theme boost
autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr
nss zlib libsecret libXrandr randrproto which libxslt libtasn1 nss zlib libsecret libXrandr randrproto which libxslt libtasn1
gmp nettle makeWrapper ]; gmp nettle makeWrapper ];
@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-ldap-dir=${openldap}" "--with-ldap-dir=${openldap}"
"--with-libsasl2-dir=${cyrus_sasl}" "--with-libsasl2-dir=${cyrus_sasl}"
"--with-boost-libdir=${boost.lib}/lib"
"--disable-gconf" "--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"; configureFlags = "--with-extra-includes=${libjpeg}/include";
buildInputs = buildInputs =
[ pkgconfig autoreconfHook commoncpp2 openssl boost boost.lib libsndfile [ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile
libxml2 libjpeg readline qt3 perl file libxml2 libjpeg readline qt3 perl file
# optional ? : # optional ? :
alsaLib speex alsaLib speex

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

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
}; };
buildInputs = [ qt5 pkgconfig boost boost.lib ]; buildInputs = [ qt5 pkgconfig boost ];
postPatch = '' postPatch = ''
sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro 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"; sha256 = "3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf";
}; };
buildInputs = [ cmake pkgconfig qt4 boost boost.lib bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ]; buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ];
cmakeFlags = '' cmakeFlags = ''
-DUSE_ASPELL=ON -DUSE_ASPELL=ON

3
pkgs/applications/networking/p2p/qbittorrent/default.nix
View File

@ -12,9 +12,6 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 which dbus_libs boost libtorrentRasterbar buildInputs = [ qt4 which dbus_libs boost libtorrentRasterbar
pkgconfig ]; pkgconfig ];
configureFlags = "--with-libboost-inc=${boost}/include "
+ "--with-libboost-lib=${boost}/lib";
# https://github.com/qbittorrent/qBittorrent/issues/1992 # https://github.com/qbittorrent/qBittorrent/issues/1992
#enableParallelBuilding = true; #enableParallelBuilding = true;

1
pkgs/applications/networking/p2p/twister/default.nix
View File

@ -26,7 +26,6 @@ in stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-libgeoip" "--with-libgeoip"
"--with-libiconv" "--with-libiconv"
"--with-boost=${boost}"
"--disable-deprecated-functions" "--disable-deprecated-functions"
"--enable-tests" "--enable-tests"
"--enable-python-binding" "--enable-python-binding"

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

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

10
pkgs/applications/office/libreoffice/default.nix
View File

@ -40,9 +40,7 @@ let
sha256 = "10amvz7fzr1kcy3svfspkdykmspqgpjdmk44cyr406wi7v4lwnf9"; sha256 = "10amvz7fzr1kcy3svfspkdykmspqgpjdmk44cyr406wi7v4lwnf9";
}; };
configureFlags = "--with-boost=${boost}"; buildInputs = [ boost mdds pkgconfig ];
buildInputs = [ boost boost.lib mdds pkgconfig ];
}; };
fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl { fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl {
@ -60,9 +58,8 @@ let
(x: x.name == "${name}.tar.bz2") (x: x.name == "${name}.tar.bz2")
("Error: update liborcus version inside LO expression") ("Error: update liborcus version inside LO expression")
(import ./libreoffice-srcs.nix)); (import ./libreoffice-srcs.nix));
configureFlags = "--with-boost=${boost}";
buildInputs = [ boost boost.lib mdds pkgconfig zlib libixion ]; buildInputs = [ boost mdds pkgconfig zlib libixion ];
}; };
fetchSrc = {name, sha256}: fetchurl { fetchSrc = {name, sha256}: fetchurl {
@ -198,7 +195,6 @@ stdenv.mkDerivation rec {
"--with-system-headers" "--with-system-headers"
"--with-system-openssl" "--with-system-openssl"
"--with-system-openldap" "--with-system-openldap"
"--with-boost-libdir=${boost.lib}/lib"
"--without-system-libwps" # TODO "--without-system-libwps" # TODO
"--without-doxygen" "--without-doxygen"
@ -236,7 +232,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = with xorg; buildInputs = with xorg;
[ ant ArchiveZip autoconf automake bison boost boost.lib cairo clucene_core [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig
freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk
hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg

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

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1pf1dgwd9j586nqmni6gqf3qxrsmawcmi9wzqfzqkjci18xd7dgy"; sha256 = "1pf1dgwd9j586nqmni6gqf3qxrsmawcmi9wzqfzqkjci18xd7dgy";
}; };
buildInputs = [ pkgconfig cmake glib qt4 boost boost.lib libsigrok buildInputs = [ pkgconfig cmake glib qt4 boost libsigrok
libsigrokdecode libserialport libzip udev libusb1 libftdi 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"; rev = "3aa11620a823d617fc033d26aedae91853d18635";
sha256 = "832520787f57f63cf47364d080f30ad10d6d6e00f166790c19b125be3d6dd45c"; sha256 = "832520787f57f63cf47364d080f30ad10d6d6e00f166790c19b125be3d6dd45c";
}; };
buildInputs = [ cmake boost boost.lib bison flex perl zlib ]; buildInputs = [ cmake boost bison flex perl zlib ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
patchPhase = '' patchPhase = ''
sed -e 's,^export(PACKAGE.*,,' -i CMakeLists.txt sed -e 's,^export(PACKAGE.*,,' -i CMakeLists.txt

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

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

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

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

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

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

1
pkgs/applications/video/mkvtoolnix/default.nix
View File

@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
expat wxGTK zlib ruby gettext pkgconfig curl expat wxGTK zlib ruby gettext pkgconfig curl
]; ];
configureFlags = "--with-boost-libdir=${boost}/lib";
buildPhase = '' buildPhase = ''
ruby ./drake ruby ./drake
''; '';

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

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ cmake pkgconfig boost boost.lib libunwind mariadb libmemcached pcre [ cmake pkgconfig boost libunwind mariadb libmemcached pcre
libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml 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"; sha256 = "1s0ylyrx74vgw6vsg6xxk4b07jrxh8pqcmxcbkx46v01nczv3ixj";
}; };
buildInputs = [ cmake boost boost.lib gmp mpfr ]; buildInputs = [ cmake boost gmp mpfr ];
doCheck = false; doCheck = false;

2
pkgs/development/libraries/boost/1.55.nix
View File

@ -59,7 +59,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
outputs = [ "out" "lib" ]; outputs = [ "out" ];
buildInputs = buildInputs =
[ icu expat zlib bzip2 python ] [ icu expat zlib bzip2 python ]

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

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

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

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

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

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
md5 = "0765cf203f451394df98e6ddf7bf2541"; md5 = "0765cf203f451394df98e6ddf7bf2541";
}; };
buildInputs = [ cmake boost boost.lib openssl ]; buildInputs = [ cmake boost openssl ];
cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=RELEASE" ]; cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=RELEASE" ];

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

@ -8,9 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf"; sha256 = "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf";
}; };
configureFlags = [ "--with-boost=${boost}" ]; buildInputs = [ expat zlib boost ];
buildInputs = [ expat zlib boost boost.lib ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://libopenraw.freedesktop.org/wiki/Exempi/; homepage = http://libopenraw.freedesktop.org/wiki/Exempi/;

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

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

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

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-fpermissive"; # I'm too lazy to catch all gcc47-related problems NIX_CFLAGS_COMPILE = "-fpermissive"; # I'm too lazy to catch all gcc47-related problems
buildInputs = [ buildInputs = [
SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost boost.lib expat SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat
freetype libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng freetype libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng
]; ];

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

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

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

@ -1,7 +1,7 @@
{stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig {stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig
, mesa}: , mesa}:
let let
buildInputs = [scons SDL SDL_image boost boost.lib libpng SDL_mixer pkgconfig mesa]; buildInputs = [scons SDL SDL_image boost libpng SDL_mixer pkgconfig mesa];
s = # Generated upstream information s = # Generated upstream information
rec { rec {
baseName="pingus"; 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" "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
"-DPREFER_STATIC_LIBS:BOOL=OFF"]; "-DPREFER_STATIC_LIBS:BOOL=OFF"];
buildInputs = [ cmake lzma boost boost.lib libdevil zlib p7zip openal libvorbis freetype SDL buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL
xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper
docbook_xsl_ns systemd ] docbook_xsl_ns systemd ]
++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI jdk

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

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

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

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib
boost boost.lib fribidi cmake freetype libpng pkgconfig lua boost fribidi cmake freetype libpng pkgconfig lua
dbus fontconfig libtool ]; dbus fontconfig libtool ];
cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030 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"; sha256 = "1c03yi19d5h5h78h37add9csmy0mzvvmvn7zkcalwszabdhsb5yk";
}; };
buildInputs = [ cmake python boost boost.lib libuuid ruby ]; buildInputs = [ cmake python boost libuuid ruby ];
# the subdir managementgen wants to install python stuff in ${python} and # the subdir managementgen wants to install python stuff in ${python} and
# the installation tries to create some folders in /var # the installation tries to create some folders in /var

2
pkgs/servers/nosql/mongodb/default.nix
View File

@ -13,7 +13,7 @@ let version = "2.6.5";
# "v8" # "v8"
] ++ optionals (!stdenv.isDarwin) [ "tcmalloc" ]; ] ++ optionals (!stdenv.isDarwin) [ "tcmalloc" ];
buildInputs = [ buildInputs = [
sasl boost boost.lib gperftools pcre snappy sasl boost gperftools pcre snappy
libyamlcpp sasl openssl libpcap libyamlcpp sasl openssl libpcap
]; ];

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

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
configureFlags = "--lib-path ${gperftools}/lib"; configureFlags = "--lib-path ${gperftools}/lib";
buildInputs = [ protobuf boost boost.lib zlib curl ]; buildInputs = [ protobuf boost zlib curl ];
nativeBuildInputs = [ which m4 python ]; nativeBuildInputs = [ which m4 python ];

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

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]; nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ];
buildInputs = [ buildInputs = [
boost boost.lib btrfsProgs cryptopp curl expat fcgi fuse gperftools keyutils boost btrfsProgs cryptopp curl expat fcgi fuse gperftools keyutils
libatomic_ops leveldb libaio libedit libuuid linuxHeaders openssl python libatomic_ops leveldb libaio libedit libuuid linuxHeaders openssl python
snappy udev xfsprogs.lib xz zfs snappy udev xfsprogs.lib xz zfs
]; ];

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

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

2
pkgs/tools/graphics/enblend-enfuse/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1b7r1nnwaind0344ckwggy0ghl0ipbk9jzylsxcjfl05rnasw00w"; sha256 = "1b7r1nnwaind0344ckwggy0ghl0ipbk9jzylsxcjfl05rnasw00w";
}; };
buildInputs = [ boost boost.lib freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ]; buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ];
nativeBuildInputs = [ perl pkgconfig ]; nativeBuildInputs = [ perl pkgconfig ];

2
pkgs/tools/graphics/povray/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation {
sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in} sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in}
''; '';
configureFlags = "COMPILED_BY='nix' --with-boost-libdir=${boost}/lib --with-boost-includedir=${boost}/include"; configureFlags = [ "COMPILED_BY='nix'" ];
preInstall = '' preInstall = ''
mkdir "$TMP/bin" mkdir "$TMP/bin"

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

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

2
pkgs/tools/text/source-highlight/default.nix
View File

@ -12,8 +12,6 @@ stdenv.mkDerivation {
sha256 = "1s49ld8cnpzhhwq0r7s0sfm3cg3nhhm0wla27lwraifrrl3y1cp1"; sha256 = "1s49ld8cnpzhhwq0r7s0sfm3cg3nhhm0wla27lwraifrrl3y1cp1";
}; };
configureFlags = [ "--with-boost=${boost}" ];
buildInputs = [ boost ]; buildInputs = [ boost ];
enableParallelBuilding = false; enableParallelBuilding = false;