Unverified Commit 00bdf78a authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #215267 from onny/nextcloud-client 

nextcloud-client: 3.6.6 -> 3.7.1
parents a7b862f4 dda83f54

pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch

+3 −8
Original line number Diff line number Diff line
@@ -8,18 +8,13 @@ Subject: [PATCH] Explicitly copy dbus files into the store dir 
 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt

index 1f35335..7f76951 100644

index 2e7349ef7..512d4b188 100644

--- a/shell_integration/libcloudproviders/CMakeLists.txt

+++ b/shell_integration/libcloudproviders/CMakeLists.txt

@@ -19,7 +19,7 @@ MACRO(PKGCONFIG_GETVAR _package _var _output_variable)

 ENDMACRO(PKGCONFIG_GETVAR _package _var _output_variable)

 

@@ -1,5 +1,6 @@

 macro(dbus_add_activation_service _sources)

-    PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir)

     pkg_get_variable(_install_dir dbus-1 session_bus_services_dir)

+    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})
 
-- 

2.19.2

pkgs/applications/networking/nextcloud-client/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


mkDerivation rec {

  pname = "nextcloud-client";

  version = "3.6.6";

  version = "3.7.1";



  outputs = [ "out" "dev" ];
@@ -34,7 +34,7 @@ mkDerivation rec { 
    owner = "nextcloud";

    repo = "desktop";

    rev = "v${version}";

    sha256 = "sha256-P3LSgrcMZZM0OY3yQz8t3Cf5spJJTB+JTIpoT9U3+xc=";

    sha256 = "sha256-MbxGS1Msb3xCW0z8FrIZEY3XaBa4BmN+JFBkV/Pf79A=";

  };



  patches = [