diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-10-01 12:55:40 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-11-02 17:22:27 -0800 |
| commit | aa3e800be7a2d76419d87c23e71121a2c9424be9 (patch) | |
| tree | 7eb03b8a2883b58694dac31c86d70f048b45d57b /pkgs/applications/office | |
| parent | ecfc1a7fc398482f8acecfd8fe93156a9750cee7 (diff) | |
| download | nixlib-aa3e800be7a2d76419d87c23e71121a2c9424be9.tar nixlib-aa3e800be7a2d76419d87c23e71121a2c9424be9.tar.gz nixlib-aa3e800be7a2d76419d87c23e71121a2c9424be9.tar.bz2 nixlib-aa3e800be7a2d76419d87c23e71121a2c9424be9.tar.lz nixlib-aa3e800be7a2d76419d87c23e71121a2c9424be9.tar.xz nixlib-aa3e800be7a2d76419d87c23e71121a2c9424be9.tar.zst nixlib-aa3e800be7a2d76419d87c23e71121a2c9424be9.zip | |
boost: Remove boost.lib
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 | 10 |
2 files changed, 4 insertions, 8 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 e7583c437c81..7b183a0211d3 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -40,9 +40,7 @@ let sha256 = "10amvz7fzr1kcy3svfspkdykmspqgpjdmk44cyr406wi7v4lwnf9"; }; - configureFlags = "--with-boost=${boost}"; - - buildInputs = [ boost boost.lib mdds pkgconfig ]; + buildInputs = [ boost mdds pkgconfig ]; }; fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl { @@ -60,9 +58,8 @@ 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 ]; }; fetchSrc = {name, sha256}: fetchurl { @@ -198,7 +195,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 +232,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 |