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

Merge pull request #63140 from Izorkin/libreoffice-fix

Browse Source 
libreoffice: fix build
This commit is contained in:
Michael Raskin 2019-06-15 18:05:56 +00:00 committed by GitHub
commit 079183a983
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mariadb , librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@ -345,24 +345,25 @@ in stdenv.mkDerivation rec {
make slowcheck make slowcheck
''; '';
nativeBuildInputs = [ wrapGAppsHook gdb fontforge autoconf automake bison pkgconfig libtool ];
buildInputs = with xorg; buildInputs = with xorg;
[ ant ArchiveZip autoconf automake bison boost cairo clucene_core [ ant ArchiveZip boost cairo clucene_core
IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig
freetype GConf getopt gnome_vfs gperf gtk3 gtk2 freetype GConf getopt gnome_vfs gperf gtk3 gtk2
hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXaw libXext libXi libXinerama libxml2 libxslt libXtst
libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base glib mariadb gst_all_1.gst-plugins-base glib mysql.connector-c
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
python3 sablotron sane-backends unzip vigra which zip zlib python3 sablotron sane-backends unzip vigra which zip zlib
mdds bluez5 libcmis libwps libabw libzmf libtool mdds bluez5 libcmis libwps libabw libzmf
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses epoxy librevenge libe-book libmwaw glm glew ncurses epoxy
libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
] ]
++ lib.optional kdeIntegration kdelibs4; ++ lib.optional kdeIntegration kdelibs4;
nativeBuildInputs = [ wrapGAppsHook gdb fontforge ];
passthru = { passthru = {
inherit srcs jdk; inherit srcs jdk;