diff options
author | William A. Kennington III <william@wkennington.com> | 2014-09-19 10:56:08 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2014-09-21 17:20:59 -0700 |
commit | 31220480d83a642f8bf6fe0529633c9460384666 (patch) | |
tree | 816642d7700126191bb3ba070c42229213a8c690 /pkgs/development | |
parent | be2c1d79082e92e17c58566fe01cba9fa13857e5 (diff) | |
download | nixlib-31220480d83a642f8bf6fe0529633c9460384666.tar nixlib-31220480d83a642f8bf6fe0529633c9460384666.tar.gz nixlib-31220480d83a642f8bf6fe0529633c9460384666.tar.bz2 nixlib-31220480d83a642f8bf6fe0529633c9460384666.tar.lz nixlib-31220480d83a642f8bf6fe0529633c9460384666.tar.xz nixlib-31220480d83a642f8bf6fe0529633c9460384666.tar.zst nixlib-31220480d83a642f8bf6fe0529633c9460384666.zip |
boost: Update depdendent packages
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/hhvm/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/CGAL/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/botan/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/botan/unstable.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/cpp-netlib/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/libtorrent-rasterbar/default.nix | 4 |
6 files changed, 17 insertions, 15 deletions
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index d2f243903185..1873b58e802e 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 4c2739d00ecf..512a17e6d3ea 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 64dd821c43f4..e603b904ddac 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 677172dd3ac5..be541a1d8ec3 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 43849bf8ed8a..3ce9dc38b3c1 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 0745313b41e7..becca407ce92 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" |