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/office | |
| 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/office')
| -rw-r--r-- | pkgs/applications/office/ledger/3.0.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 14 |
2 files changed, 9 insertions, 7 deletions
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 |