From 41d966187675330d0d768d4da08a46dfc6dd7763 Mon Sep 17 00:00:00 2001 From: kleifgch <81602214+kleifgch@users.noreply.github.com> Date: Sat, 28 Dec 2024 18:08:01 +0100 Subject: [PATCH] nextcloud-client: remove unneeded patch The removed patch was intended to install the dbus service in the proper location, but due to a typo (`service` vs. `services`) never did. In the meantime, upstream introduced commit [1] making the patch unnecessary. To check that everything is in order, one can build nextcloud-client and verify that the service file is located at $out/share/dbus-1/services/. [1] https://github.com/nextcloud/desktop/commit/6e1e8a8bdc1a8a1b9894792cc3e3664065dfda39 --- ...y-copy-dbus-files-into-the-store-dir.patch | 21 ------------------- .../networking/nextcloud-client/default.nix | 2 -- 2 files changed, 23 deletions(-) delete mode 100644 pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch diff --git a/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch b/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch deleted file mode 100644 index 56cc005733a77..0000000000000 --- a/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch +++ /dev/null @@ -1,21 +0,0 @@ -From bbd366348d1f0e334d4604d04e293a046070e666 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Fri, 23 Aug 2019 00:19:20 +0200 -Subject: [PATCH] Explicitly copy dbus files into the store dir - ---- - shell_integration/libcloudproviders/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt -index b4434d0..b57e033 100644 ---- a/shell_integration/libcloudproviders/CMakeLists.txt -+++ b/shell_integration/libcloudproviders/CMakeLists.txt -@@ -4,6 +4,7 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.28.0") - else() - pkg_get_variable(_install_dir dbus-1 session_bus_services_dir) - endif() -+ set(_install_dir "${CMAKE_INSTALL_DATADIR}/dbus-1/service") - foreach (_i ${_sources}) - get_filename_component(_service_file ${_i} ABSOLUTE) - string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i}) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index d2ed2c084015a..376dbae748363 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -39,8 +39,6 @@ stdenv.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 ];