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

libreoffice: use wrapGAppsHook

Browse Source
This commit is contained in:
gnidorah 2017-11-30 10:10:09 +03:00
parent 0c402c6056
commit f423efb7f5
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme , defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ] , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
, withHelp ? true , withHelp ? true
@ -166,10 +166,6 @@ in stdenv.mkDerivation rec {
for a in sbase scalc sdraw smath swriter simpress soffice; do for a in sbase scalc sdraw smath swriter simpress soffice; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a ln -s $out/lib/libreoffice/program/$a $out/bin/$a
wrapProgram "$out/bin/$a" \
--prefix XDG_DATA_DIRS : \
"$out/share:$GSETTINGS_SCHEMAS_PATH" \
;
done done
ln -s $out/bin/soffice $out/bin/libreoffice ln -s $out/bin/soffice $out/bin/libreoffice
@ -252,16 +248,17 @@ in stdenv.mkDerivation rec {
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 mesa mythes gst_all_1.gstreamer libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base gsettings_desktop_schemas glib gst_all_1.gst-plugins-base glib
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 glibc libcmis libwps libabw libzmf libtool mdds bluez5 glibc libcmis libwps libabw libzmf libtool
libxshmfence libatomic_ops graphite2 harfbuzz gpgme libxshmfence libatomic_ops graphite2 harfbuzz gpgme
librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy
libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper libodfgen CoinMP librdf_rasqal defaultIconTheme
gdb gdb
] ]
++ lib.optional kdeIntegration kdelibs4; ++ lib.optional kdeIntegration kdelibs4;
nativeBuildInputs = [ wrapGAppsHook ];
passthru = { passthru = {
inherit srcs; inherit srcs;

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

@ -11,7 +11,7 @@
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
, libatomic_ops, graphite2, harfbuzz, libodfgen , libatomic_ops, graphite2, harfbuzz, libodfgen
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
, defaultIconTheme, glib, ncurses , defaultIconTheme, glib, ncurses
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ] , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
, withHelp ? true , withHelp ? true
@ -162,10 +162,6 @@ in stdenv.mkDerivation rec {
for a in sbase scalc sdraw smath swriter simpress soffice; do for a in sbase scalc sdraw smath swriter simpress soffice; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a ln -s $out/lib/libreoffice/program/$a $out/bin/$a
wrapProgram "$out/bin/$a" \
--prefix XDG_DATA_DIRS : \
"$out/share:$GSETTINGS_SCHEMAS_PATH" \
;
done done
ln -s $out/bin/soffice $out/bin/libreoffice ln -s $out/bin/soffice $out/bin/libreoffice
@ -247,15 +243,16 @@ in stdenv.mkDerivation rec {
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 mesa mythes gst_all_1.gstreamer libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base gsettings_desktop_schemas glib gst_all_1.gst-plugins-base glib
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 glibc libcmis libwps libabw libzmf mdds bluez5 glibc libcmis libwps libabw libzmf
libxshmfence libatomic_ops graphite2 harfbuzz libxshmfence libatomic_ops graphite2 harfbuzz
librevenge libe-book libmwaw glm glew ncurses librevenge libe-book libmwaw glm glew ncurses
libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper libodfgen CoinMP librdf_rasqal defaultIconTheme
] ]
++ lib.optional kdeIntegration kdelibs4; ++ lib.optional kdeIntegration kdelibs4;
nativeBuildInputs = [ wrapGAppsHook ];
passthru = { passthru = {
inherit srcs; inherit srcs;

4
pkgs/top-level/all-packages.nix
View File

@ -15555,7 +15555,7 @@ with pkgs;
libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice { libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice {
inherit (perlPackages) ArchiveZip CompressZlib; inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome2) GConf ORBit2 gnome_vfs;
inherit (gnome3) gsettings_desktop_schemas defaultIconTheme; inherit (gnome3) defaultIconTheme;
zip = zip.override { enableNLS = false; }; zip = zip.override { enableNLS = false; };
bluez5 = bluez5_28; bluez5 = bluez5_28;
fontsConf = makeFontsConf { fontsConf = makeFontsConf {
@ -15575,7 +15575,7 @@ with pkgs;
libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix { libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix {
inherit (perlPackages) ArchiveZip CompressZlib; inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome2) GConf ORBit2 gnome_vfs;
inherit (gnome3) gsettings_desktop_schemas defaultIconTheme; inherit (gnome3) defaultIconTheme;
zip = zip.override { enableNLS = false; }; zip = zip.override { enableNLS = false; };
#glm = glm_0954; #glm = glm_0954;
bluez5 = bluez5_28; bluez5 = bluez5_28;