cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #67306 from Ma27/bump-nextcloud-client

Browse source 
nextcloud-client: 2.5.2 -> 2.5.3
This commit is contained in:
worldofpeace 2019-08-23 11:05:01 -04:00 committed by GitHub
commit 54f385241e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,25 @@
From bbd366348d1f0e334d4604d04e293a046070e666 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
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 1f35335..7f76951 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)
macro(dbus_add_activation_service _sources)
- PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir)
+ set(_install_dir "${CMAKE_INSTALL_PREFIX}/etc/dbus-1/service")
foreach (_i ${_sources})
get_filename_component(_service_file ${_i} ABSOLUTE)
string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
--
2.19.2

20
pkgs/applications/networking/nextcloud-client/default.nix
View file

@ -1,20 +1,24 @@
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite
, inotify-tools, wrapQtAppsHook, openssl_1_1, pcre, qtwebengine, libsecret
{ lib, mkDerivation, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite
, inotify-tools, openssl_1_1, pcre, qtwebengine, libsecret
, libcloudproviders
}:
stdenv.mkDerivation rec {
mkDerivation rec {
name = "nextcloud-client-${version}";
version = "2.5.2";
version = "2.5.3";
src = fetchgit {
url = "git://github.com/nextcloud/desktop.git";
rev = "refs/tags/v${version}";
sha256 = "1brpxdgyy742dqw6cyyv2257d6ihwiqhbzfk2hb8zjgbi6p9lhsr";
sha256 = "0fbw56bfbyk3cqv94iqfsxjf01dwy1ysjz89dri7qccs65rnjswj";
fetchSubmodules = true;
};
nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ];
patches = [
./0001-Explicitly-copy-dbus-files-into-the-store-dir.patch
];
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools libcloudproviders ];
@ -32,7 +36,7 @@ stdenv.mkDerivation rec {
];
qtWrapperArgs = [
''--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libsecret ]}''
''--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}''
];
postInstall = ''
@ -40,7 +44,7 @@ stdenv.mkDerivation rec {
$out/share/applications/nextcloud.desktop
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Nextcloud themed desktop client";
homepage = https://nextcloud.com;
license = licenses.gpl2;