summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarvin Dostal <maffinmaffinmaffinmaffin@gmail.com>2021-10-21 18:19:24 +0200
committerJonathan Ringer <jonringer@users.noreply.github.com>2021-11-08 18:56:36 -0800
commit52ffa1c36d6d79ea7b9285f5410a8128b74688ce (patch)
tree769dc3399992c940d2526129b667a1904afc2197
parentafce4452088cdc4d28058184a8df0c0407b8ccfe (diff)
downloadnixpkgs-52ffa1c36d6d79ea7b9285f5410a8128b74688ce.tar
nixpkgs-52ffa1c36d6d79ea7b9285f5410a8128b74688ce.tar.gz
nixpkgs-52ffa1c36d6d79ea7b9285f5410a8128b74688ce.tar.bz2
nixpkgs-52ffa1c36d6d79ea7b9285f5410a8128b74688ce.tar.lz
nixpkgs-52ffa1c36d6d79ea7b9285f5410a8128b74688ce.tar.xz
nixpkgs-52ffa1c36d6d79ea7b9285f5410a8128b74688ce.tar.zst
nixpkgs-52ffa1c36d6d79ea7b9285f5410a8128b74688ce.zip
nextcloud-client: make autostart entry start client from path
-rw-r--r--pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch26
-rw-r--r--pkgs/applications/networking/nextcloud-client/default.nix1
2 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch
new file mode 100644
index 00000000000..73325791fc2
--- /dev/null
+++ b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch
@@ -0,0 +1,26 @@
+From bade623bb98c957d9a274df75b58296beb8ae6a7 Mon Sep 17 00:00:00 2001
+From: Marvin Dostal <maffinmaffinmaffinmaffin@gmail.com>
+Date: Sun, 17 Oct 2021 21:26:51 +0200
+Subject: [PATCH] When creating the autostart entry, do not use an absolute
+ path
+
+---
+ src/common/utility_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/utility_unix.cpp b/src/common/utility_unix.cpp
+index 010408395..16964c64f 100644
+--- a/src/common/utility_unix.cpp
++++ b/src/common/utility_unix.cpp
+@@ -83,7 +83,7 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName,
+         ts << QLatin1String("[Desktop Entry]") << endl
+            << QLatin1String("Name=") << guiName << endl
+            << QLatin1String("GenericName=") << QLatin1String("File Synchronizer") << endl
+-           << QLatin1String("Exec=\"") << executablePath << "\" --background" << endl
++           << QLatin1String("Exec=") << "nextcloud --background" << endl
+            << QLatin1String("Terminal=") << "false" << endl
+            << QLatin1String("Icon=") << APPLICATION_ICON_NAME << endl
+            << QLatin1String("Categories=") << QLatin1String("Network") << endl
+-- 
+2.31.1
+
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index 027a1b6dd79..e611f9ee015 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -33,6 +33,7 @@ mkDerivation rec {
   patches = [
     # Explicitly move dbus configuration files to the store path rather than `/etc/dbus-1/services`.
     ./0001-Explicitly-copy-dbus-files-into-the-store-dir.patch
+    ./0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch
   ];
 
   nativeBuildInputs = [