diff options
author | Peter Simons <simons@cryp.to> | 2014-11-03 23:03:01 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-11-03 23:03:01 +0100 |
commit | b5fed52c43360c8a1e6b632236ad41d98c59f804 (patch) | |
tree | efcffbcbed9a980ee912f914baf535bf6181e74d /pkgs/applications | |
parent | 0346efdabfeef55d64c738e093795acc0e80d2d8 (diff) | |
parent | 8d605dafc65ede7c4d33178192807612527c911d (diff) | |
download | nixlib-b5fed52c43360c8a1e6b632236ad41d98c59f804.tar nixlib-b5fed52c43360c8a1e6b632236ad41d98c59f804.tar.gz nixlib-b5fed52c43360c8a1e6b632236ad41d98c59f804.tar.bz2 nixlib-b5fed52c43360c8a1e6b632236ad41d98c59f804.tar.lz nixlib-b5fed52c43360c8a1e6b632236ad41d98c59f804.tar.xz nixlib-b5fed52c43360c8a1e6b632236ad41d98c59f804.tar.zst nixlib-b5fed52c43360c8a1e6b632236ad41d98c59f804.zip |
Merge pull request #4238 from wkennington/master.boost
Make boost 156 the default
Diffstat (limited to 'pkgs/applications')
36 files changed, 84 insertions, 81 deletions
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index fd61c65dba2e..5e88da8f856e 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; 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 ]; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index f6c0d9e99450..450b57a68195 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; 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 ]; diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index 769af20c0ed0..d273c2381778 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 boost.lib ]; + buildInputs = [ pulseaudio boost ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index ec168486f6d3..bab6cdcf33f0 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost boost.lib cairo fftwSinglePrec fltk jack2 libsndfile mesa + alsaLib boost cairo fftwSinglePrec fltk jack2 libsndfile mesa minixml zlib xorg.libpthreadstubs ]; diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 0235f892b8dc..a7665177046b 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 - boost.lib zlib python swig gfortran soqt libf2c makeWrapper matplotlib + zlib python swig gfortran soqt libf2c makeWrapper matplotlib pycollada pyside pysideShiboken ]; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index e914186ac815..902538991fd3 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchgit, pkgconfig, autoconf, automake, gtk, libpng, exiv2, lcms -, intltool, gettext, libchamplain, fbida }: +{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, gtk, libpng, exiv2 +, lcms, intltool, gettext, libchamplain, fbida +}: stdenv.mkDerivation rec { name = "geeqie-${version}"; @@ -11,22 +12,25 @@ stdenv.mkDerivation rec { sha256 = "1h9w0jrcqcp5jjgmks5pvpppnfxhcd1s3vqlyb3qyil2wfk8n8wp"; }; - preConfigure = "./autogen.sh"; - - configureFlags = [ "--enable-gps" ]; - - buildInputs = - [ pkgconfig autoconf automake gtk libpng exiv2 lcms intltool gettext - libchamplain - ]; - - postInstall = - '' - # Allow geeqie to find exiv2 and exiftran, necessary to - # losslessly rotate JPEG images. - sed -i $out/lib/geeqie/geeqie-rotate \ - -e '1 a export PATH=${exiv2}/bin:${fbida}/bin:$PATH' - ''; + configureFlags = [ + "--enable-gps" + ]; + + configurePhase = '' + ./autogen.sh $configureFlags + ''; + + buildInputs = [ + autoconf automake libtool pkgconfig gtk libpng exiv2 lcms intltool gettext + libchamplain + ]; + + postInstall = '' + # Allow geeqie to find exiv2 and exiftran, necessary to + # losslessly rotate JPEG images. + sed -i $out/lib/geeqie/geeqie-rotate \ + -e '1 a export PATH=${exiv2}/bin:${fbida}/bin:$PATH' + ''; meta = with stdenv.lib; { description = "Lightweight GTK+ based image viewer"; diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 7f2d3e245890..7558b0aef4b6 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 boost.lib exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ]; + buildInputs = [ qt5 boost 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 f6d7c25b196d..00ba14d98af6 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - boost boost.lib cmake ilmbase libjpeg libpng libtiff opencolorio openexr + boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip ]; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 67611d2f67cc..e6d5ee5528f0 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; 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 ]; diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index b314bdaf6baa..2ff824124098 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 boost.lib gmp mpfr flex bison dxflib]; + buildInputs = [qt4 cgal boost gmp mpfr flex bison dxflib]; configurePhase = '' qmake; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index fb95510fa130..6af51e817785 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -23,29 +23,37 @@ let sha256 = "04mx321z929ngl65hfc1hv5jw37wqbh8y2avmpvajagvn6lp3zdl"; }; + configureFlags = [ + "--with-boost=${boost.dev}" + "--with-boost-libdir=${boost.lib}/lib" + ]; + patches = [ ./synfig-cstring.patch ]; buildInputs = [ - ETL boost boost.lib cairo gettext glibmm libsigcxx libtool libxmlxx pango + ETL boost cairo gettext glibmm libsigcxx libtool libxmlxx pango pkgconfig ]; - - configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]; }; in stdenv.mkDerivation rec { name = "synfigstudio-${version}"; src = fetchurl { - url = "mirror://sourceforge/synfig/${name}.tar.gz"; - sha256 = "13hw4z6yx70g4mnjmvmxkk7b1qzlwmqjhxflq5dd6cqdsmfw9mc7"; - }; + url = "mirror://sourceforge/synfig/${name}.tar.gz"; + sha256 = "13hw4z6yx70g4mnjmvmxkk7b1qzlwmqjhxflq5dd6cqdsmfw9mc7"; + }; buildInputs = [ ETL boost cairo fontsConf gettext glibmm gtk gtkmm imagemagick intltool intltool libsigcxx libtool libxmlxx pkgconfig synfig ]; + configureFlags = [ + "--with-boost=${boost.dev}" + "--with-boost-libdir=${boost.lib}/lib" + ]; + preBuild = '' export FONTCONFIG_FILE=${fontsConf} ''; diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index 242ee4e9c9f5..808984ad664d 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -23,10 +23,6 @@ stdenv.mkDerivation rec { cd bitcoin* ''; - configureFlags = [ - "--with-boost=${boost}" - ]; - preCheck = '' # At least one test requires writing in $HOME HOME=$TMPDIR diff --git a/pkgs/applications/misc/bitcoin/dogecoin.nix b/pkgs/applications/misc/bitcoin/dogecoin.nix index 7ace3c161c7b..21da32104d34 100644 --- a/pkgs/applications/misc/bitcoin/dogecoin.nix +++ b/pkgs/applications/misc/bitcoin/dogecoin.nix @@ -30,7 +30,6 @@ let ./autogen.sh \ && ./configure --prefix=$out \ --with-incompatible-bdb \ - --with-boost-libdir=${boost}/lib \ ${ if withGui then "--with-gui" else "" } ''; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 5b2c5776cf43..01f9b861bf27 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 boost.lib cmake ffmpeg gettext glew ilmbase libXi + [ SDL boost 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/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index d6ca3939d137..66fceec9a51b 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -10,10 +10,6 @@ stdenv.mkDerivation { sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m"; }; - configurePhase = "./configure --prefix=\$out " - + " --with-boost-libdir=\$boost/lib" - + " --with-boost-includedir=\$boost/include"; - buildInputs = [ gtk glib pkgconfig openssl boost ]; meta = { diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix index 06ea5e9ad5cb..65265fc07a5a 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 boost.lib gmp mpfr miniupnpc qt4 unzip ]; + buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip ]; configurePhase = "qmake"; diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index db8595e1baa8..045d6f9f92ab 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; 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 ]; diff --git a/pkgs/applications/misc/librecad/2.0.nix b/pkgs/applications/misc/librecad/2.0.nix index 8b7a9a40c872..6cc775b72d39 100644 --- a/pkgs/applications/misc/librecad/2.0.nix +++ b/pkgs/applications/misc/librecad/2.0.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; configurePhase = '' - qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost} + qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost.dev} ''; installPhase = '' diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix index 52e8d20495b9..1fe5406384f8 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 boost.lib ]; + buildInputs = [ cmake boost ]; # these tests take a long time and don't # always complete in the build environment diff --git a/pkgs/applications/misc/namecoin/default.nix b/pkgs/applications/misc/namecoin/default.nix index 94ee63fe2de2..d9e09923c3be 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 boost.lib openssl unzip ]; + buildInputs = [ db4 boost 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 6b63bf7ca348..2a83a4d11d6f 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 boost.lib openssl unzip qt4 ]; + buildInputs = [ db4 boost openssl unzip qt4 ]; configurePhase = '' qmake USE_UPNP=- diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index e144d12f762e..65c2ccb5ff0b 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 boost.lib ]; + buildInputs = [ qt4 pkgconfig boost ]; 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 41bd4ca45131..cae9fe294f34 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -16,7 +16,7 @@ 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 boost.lib + 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 ]; diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index 961ab997384e..c7f33c1f5805 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 boost.lib libsndfile + [ pkgconfig autoreconfHook commoncpp2 openssl boost 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 00ff1110c32f..2b4c5f564bec 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 boost.lib ]; + buildInputs = [ qt5 pkgconfig boost ]; 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 ba71e1985b46..e4ca6d423cdc 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 boost.lib bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ]; + buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ]; cmakeFlags = '' -DUSE_ASPELL=ON diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index ccf129881f5d..51c43771bcf7 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -2,18 +2,21 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "qbittorrent-3.1.10"; + name = "qbittorrent-3.1.11"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "0xhqli191r5v9b5x6wj1wsjlj6svf6ldgzl7jza39q3ipr5c2pg6"; + sha256 = "0qvz8ifk01b9sw9x5yh3b5kmssx5yi026zvgvabdvfaqkvcmw43i"; }; - buildInputs = [ qt4 which dbus_libs boost libtorrentRasterbar - pkgconfig ]; + buildInputs = [ + qt4 which dbus_libs boost libtorrentRasterbar pkgconfig + ]; - configureFlags = "--with-libboost-inc=${boost}/include " - + "--with-libboost-lib=${boost}/lib"; + configureFlags = [ + "--with-libboost-lib=${boost.lib}/lib" + "--with-libboost-inc=${boost.dev}/include" + ]; # https://github.com/qbittorrent/qBittorrent/issues/1992 #enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 36f83a0611bf..8d47ab2d777d 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -26,7 +26,6 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-libgeoip" "--with-libiconv" - "--with-boost=${boost}" "--disable-deprecated-functions" "--enable-tests" "--enable-python-binding" diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix index 22f15f652175..6118d377a79f 100644 --- a/pkgs/applications/office/ledger/3.0.nix +++ b/pkgs/applications/office/ledger/3.0.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "0fmmhr3as4v2kb6h64k1fq979080cqhd75jvxfg7axk2mylb6b3q"; }; - buildInputs = [ cmake boost boost.lib gmp mpfr libedit python texinfo gnused ]; + buildInputs = [ cmake boost gmp mpfr libedit python texinfo gnused ]; enableParallelBuilding = true; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index b63948690a4e..036f21fdead3 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -40,9 +40,9 @@ let sha256 = "10amvz7fzr1kcy3svfspkdykmspqgpjdmk44cyr406wi7v4lwnf9"; }; - configureFlags = "--with-boost=${boost}"; + buildInputs = [ boost mdds pkgconfig ]; - buildInputs = [ boost boost.lib mdds pkgconfig ]; + configureFlags = [ "--with-boost=${boost.dev}" ]; }; fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl { @@ -60,9 +60,10 @@ let (x: x.name == "${name}.tar.bz2") ("Error: update liborcus version inside LO expression") (import ./libreoffice-srcs.nix)); - configureFlags = "--with-boost=${boost}"; - buildInputs = [ boost boost.lib mdds pkgconfig zlib libixion ]; + buildInputs = [ boost mdds pkgconfig zlib libixion ]; + + configureFlags = [ "--with-boost=${boost.dev}" ]; }; fetchSrc = {name, sha256}: fetchurl { @@ -183,6 +184,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ + "--with-boost=${boost.dev}" + "--with-boost-libdir=${boost.lib}/lib" "--with-vendor=NixOS" # Without these, configure does not finish @@ -198,7 +201,6 @@ stdenv.mkDerivation rec { "--with-system-headers" "--with-system-openssl" "--with-system-openldap" - "--with-boost-libdir=${boost.lib}/lib" "--without-system-libwps" # TODO "--without-doxygen" @@ -236,7 +238,7 @@ stdenv.mkDerivation rec { ''; 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 freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index f9369efe96e5..07724d932541 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 boost.lib libsigrok + buildInputs = [ pkgconfig cmake glib qt4 boost 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 109d9fe3d4be..cfe96bc6983a 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 boost.lib bison flex perl zlib ]; + buildInputs = [ cmake boost 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 74eee4778472..56095762f04b 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa - boost boost.lib glm + boost glm ]; - configureFlags = "--with-boost-libdir=${boost.lib}/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 b42e781704a0..579990746097 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; 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 automationSupport lua ++ optional openalSupport openal @@ -40,8 +40,6 @@ stdenv.mkDerivation rec { 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"; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 879fa08ea382..5a519e231c80 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -30,12 +30,11 @@ stdenv.mkDerivation rec { patch -p1 < ${patch_CVE} # Add all libs to `macros/libslist', a list of library search paths. - for lib in ${lib.concatStringsSep " " - (map (lib: "\"${lib}\"/lib") - (buildInputs ++ [stdenv.glibc]))} - do + libs=$(echo "$NIX_LDFLAGS" | tr ' ' '\n' | sed -n 's/.*-L\(.*\).*/\1/p') + for lib in $libs; do echo -n "$lib " >> macros/libslist done + echo -n "${stdenv.glibc}/lib" >> macros/libslist # Make sure to honor $TMPDIR, for chroot builds. for file in configure gui/Makefile.in Makefile.in @@ -54,7 +53,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 boost.lib freetype agg + libogg libxml2 libjpeg mesa libpng libungif boost freetype agg dbus curl pkgconfig glib gtk gtkglext pangox_compat xulrunner makeWrapper diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 1523aa4377df..a6c2ff0b822a 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { expat wxGTK zlib ruby gettext pkgconfig curl ]; - configureFlags = "--with-boost-libdir=${boost}/lib"; buildPhase = '' ruby ./drake ''; |