libreoffice-still: apply review comments

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
main
Florian Brandes 2 years ago
parent dfd3754f61
commit 62e689da12
No known key found for this signature in database
GPG Key ID: 074048E893713170
  1. 2
      pkgs/applications/office/libreoffice/src-still/override.nix
  2. 13
      pkgs/applications/office/libreoffice/xdg-open-brief.patch

@ -4,7 +4,7 @@ attrs:
postConfigure = attrs.postConfigure + ''
sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx'
'';
configureFlags = attrs.configureFlags ++ [
configureFlags = attrs.configureFlags ++ [
(lib.enableFeature kdeIntegration "kf5")
"--without-system-zxing"
];

@ -1,13 +0,0 @@
diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh
index 4519e01f26e2..8985711a2c01 100755
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -393,6 +393,8 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
MAILER=/usr/bin/kde-open
elif [ -x /usr/bin/xdg-open ] ; then
MAILER=/usr/bin/xdg-open
+ elif type -p xdg-open >/dev/null 2>&1 ; then
+ MAILER="$(type -p xdg-open)"
else
echo "Unsupported mail client: `basename $MAILER | sed 's/-.*^//'`"
exit 2
Loading…
Cancel
Save