diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-09-22 19:57:15 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-09-22 19:57:15 -0700 |
| commit | 2de4144bf75556c0562b5179089844e769e31133 (patch) | |
| tree | aec1796d7d1c37ff72eb393769600f665d95d4a2 /pkgs | |
| parent | 3330d0c6705e31c06606035ceb3e892e38297f25 (diff) | |
| download | nixlib-2de4144bf75556c0562b5179089844e769e31133.tar nixlib-2de4144bf75556c0562b5179089844e769e31133.tar.gz nixlib-2de4144bf75556c0562b5179089844e769e31133.tar.bz2 nixlib-2de4144bf75556c0562b5179089844e769e31133.tar.lz nixlib-2de4144bf75556c0562b5179089844e769e31133.tar.xz nixlib-2de4144bf75556c0562b5179089844e769e31133.tar.zst nixlib-2de4144bf75556c0562b5179089844e769e31133.zip | |
More boost fixes
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/graphics/enblend-enfuse/default.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index bf6728abe637..e7583c437c81 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -42,7 +42,7 @@ let configureFlags = "--with-boost=${boost}"; - buildInputs = [ boost mdds pkgconfig ]; + buildInputs = [ boost boost.lib mdds pkgconfig ]; }; fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl { @@ -62,7 +62,7 @@ let (import ./libreoffice-srcs.nix)); configureFlags = "--with-boost=${boost}"; - buildInputs = [ boost mdds pkgconfig zlib libixion ]; + buildInputs = [ boost boost.lib mdds pkgconfig zlib libixion ]; }; fetchSrc = {name, sha256}: fetchurl { @@ -198,7 +198,7 @@ stdenv.mkDerivation rec { "--with-system-headers" "--with-system-openssl" "--with-system-openldap" - "--with-boost-libdir=${boost}/lib" + "--with-boost-libdir=${boost.lib}/lib" "--without-system-libwps" # TODO "--without-doxygen" @@ -236,7 +236,7 @@ stdenv.mkDerivation rec { ''; buildInputs = with xorg; - [ ant ArchiveZip autoconf automake bison boost cairo clucene_core + [ ant ArchiveZip autoconf automake bison boost boost.lib 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/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 6b65d3df0d3f..ac49a3c13a34 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1b7r1nnwaind0344ckwggy0ghl0ipbk9jzylsxcjfl05rnasw00w"; }; - buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ]; + buildInputs = [ boost boost.lib freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ]; nativeBuildInputs = [ perl pkgconfig ]; |