diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2018-03-27 19:18:49 +0200 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2018-03-27 19:30:09 +0200 |
commit | 95a819c0026a7a3c0dd2099e1c53fea95430c505 (patch) | |
tree | 823e77228812c6400616c48aa5140310cfbeafff /pkgs/top-level | |
parent | 7f2305c431f04178d9935ffad41956e7e542ac5c (diff) | |
download | nixlib-95a819c0026a7a3c0dd2099e1c53fea95430c505.tar nixlib-95a819c0026a7a3c0dd2099e1c53fea95430c505.tar.gz nixlib-95a819c0026a7a3c0dd2099e1c53fea95430c505.tar.bz2 nixlib-95a819c0026a7a3c0dd2099e1c53fea95430c505.tar.lz nixlib-95a819c0026a7a3c0dd2099e1c53fea95430c505.tar.xz nixlib-95a819c0026a7a3c0dd2099e1c53fea95430c505.tar.zst nixlib-95a819c0026a7a3c0dd2099e1c53fea95430c505.zip |
libreoffice: wrap to set JAVA_HOME, SAL_USE_VCLPLUGIN and DBus session if not set
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 91 |
1 files changed, 46 insertions, 45 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 546e4514a17f..0b4215a31ff4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16458,51 +16458,52 @@ with pkgs; libreoffice = hiPrio libreoffice-still; - libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice { - inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) defaultIconTheme; - zip = zip.override { enableNLS = false; }; - bluez5 = bluez5_28; - fontsConf = makeFontsConf { - fontDirectories = [ - carlito dejavu_fonts - freefont_ttf xorg.fontmiscmisc - liberation_ttf_v1_binary - liberation_ttf_v2_binary - ]; - }; - clucene_core = clucene_core_2; - lcms = lcms2; - harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; - }; - # checking whether g++ supports C++14 or C++11... configure: error: no - stdenv = overrideCC stdenv gcc5; - }); - - libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix { - inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) defaultIconTheme; - zip = zip.override { enableNLS = false; }; - bluez5 = bluez5_28; - poppler = poppler_0_61; - fontsConf = makeFontsConf { - fontDirectories = [ - freefont_ttf xorg.fontmiscmisc - ]; - }; - clucene_core = clucene_core_2; - lcms = lcms2; - harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; - }; - icu = icu58; - # checking whether g++ supports C++14 or C++11... configure: error: no - stdenv = overrideCC stdenv gcc5; - }); - + libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix + { libreoffice = callPackage ../applications/office/libreoffice { + inherit (perlPackages) ArchiveZip CompressZlib; + inherit (gnome2) GConf ORBit2 gnome_vfs; + inherit (gnome3) defaultIconTheme; + zip = zip.override { enableNLS = false; }; + bluez5 = bluez5_28; + fontsConf = makeFontsConf { + fontDirectories = [ + carlito dejavu_fonts + freefont_ttf xorg.fontmiscmisc + liberation_ttf_v1_binary + liberation_ttf_v2_binary + ]; + }; + clucene_core = clucene_core_2; + lcms = lcms2; + harfbuzz = harfbuzz.override { + withIcu = true; withGraphite2 = true; + }; + # checking whether g++ supports C++14 or C++11... configure: error: no + stdenv = overrideCC stdenv gcc5; + };}); + + libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix + { libreoffice = callPackage ../applications/office/libreoffice/still.nix { + inherit (perlPackages) ArchiveZip CompressZlib; + inherit (gnome2) GConf ORBit2 gnome_vfs; + inherit (gnome3) defaultIconTheme; + zip = zip.override { enableNLS = false; }; + bluez5 = bluez5_28; + poppler = poppler_0_61; + fontsConf = makeFontsConf { + fontDirectories = [ + freefont_ttf xorg.fontmiscmisc + ]; + }; + clucene_core = clucene_core_2; + lcms = lcms2; + harfbuzz = harfbuzz.override { + withIcu = true; withGraphite2 = true; + }; + icu = icu58; + # checking whether g++ supports C++14 or C++11... configure: error: no + stdenv = overrideCC stdenv gcc5; + };}); liferea = callPackage ../applications/networking/newsreaders/liferea { inherit (gnome3) libpeas gsettings-desktop-schemas dconf; |