JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More boost fixes

Browse Source
This commit is contained in:
William A. Kennington III 2014-09-22 19:57:15 -07:00
parent 3330d0c670
commit 2de4144bf7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/office/libreoffice/default.nix
View File

@ -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

2
pkgs/tools/graphics/enblend-enfuse/default.nix
View File

@ -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 ];