Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fecaa5491e35
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 62658a37e37f
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Apr 9, 2018

  1. libreoffice: wrap to set JAVA_HOME, SAL_USE_VCLPLUGIN and DBus sessio… 

    …n if not set

(cherry picked from commit 95a819c)
    @7c6f434c
    7c6f434c committed Apr 9, 2018
    Copy the full SHA
    62658a3 View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/office/libreoffice/default.nix
View file
Original file line number Diff line number Diff line change
@@ -269,7 +269,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ wrapGAppsHook ];

passthru = {
inherit srcs;
inherit srcs jdk;
};

requiredSystemFeatures = [ "big-parallel" ];
2 changes: 1 addition & 1 deletion pkgs/applications/office/libreoffice/still.nix
View file
Original file line number Diff line number Diff line change
@@ -261,7 +261,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ wrapGAppsHook ];

passthru = {
inherit srcs;
inherit srcs jdk;
};

requiredSystemFeatures = [ "big-parallel" ];
16 changes: 16 additions & 0 deletions pkgs/applications/office/libreoffice/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{ libreoffice, runCommand, dbus, bash }:
let
jdk = libreoffice.jdk;
in
(runCommand "${libreoffice.name}" {
inherit dbus libreoffice jdk bash;
} ''
mkdir -p "$out/bin"
ln -s "${libreoffice}/share" "$out/share"
substituteAll "${./wrapper.sh}" "$out/bin/soffice"
chmod a+x "$out/bin/soffice"
for i in $(ls "${libreoffice}/bin/"); do
test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")"
done
'') // { inherit libreoffice dbus; }
27 changes: 27 additions & 0 deletions pkgs/applications/office/libreoffice/wrapper.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!@bash@/bin/bash
export JAVA_HOME="${JAVA_HOME:-@jdk@}"
export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}"

if uname | grep Linux > /dev/null &&
! ( test -n "$DBUS_SESSION_BUS_ADDRESS" &&
test -n "$DBUS_SYSTEM_BUS_ADDRESS" ); then
dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"
mkdir "$dbus_tmp_dir"
dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")"
cat "@dbus@/share/dbus-1/system.conf" |
grep -v '[<]user[>]messagebus' > "$dbus_socket_dir/system.conf"
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
"@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" >&2 &
export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
fi
if test -z "$DBUS_SYSTEM_BUS_ADDRESS"; then
"@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "$dbus_socket_dir/system.conf" --address "unix:path=$dbus_socket_dir/system" >&2 &
export DBUS_SYSTEM_BUS_ADDRESS="unix:path=$dbus_socket_dir/system"
fi
fi

"@libreoffice@/bin/$(basename "$0")" "$@"
code="$?"

test -n "$dbus_socket_dir" && rm -rf "$dbus_socket_dir"
exit "$code"
89 changes: 45 additions & 44 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -16399,50 +16399,51 @@ 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;
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;
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;