public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nextcloud-client: clean up

Browse Source 
Continuation of https://github.com/NixOS/nixpkgs/pull/67306

* Switched to non-deprecated dbus config path.
* Removed CMake flags for finding dependencies, the project can find them on its own.
* Properly fixed the RPATH issue from https://github.com/NixOS/nixpkgs/pull/15406 – ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}.
* Dropped changing Icon name in the desktop file as it was fixed upstream.
* Switched to fetchFromGitHub, as the submodules are only for Win, Mac & crash reporting.
* Dropped enableParallelBuilding = true, as it is on by default with CMake.
This commit is contained in:
Jan Tojnar 2019-08-23 22:11:17 +02:00
parent 1329703616
commit fc79a83e68
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ index 1f35335..7f76951 100644
macro(dbus_add_activation_service _sources) macro(dbus_add_activation_service _sources)
- PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir) - PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir)
+ set(_install_dir "${CMAKE_INSTALL_PREFIX}/etc/dbus-1/service") + set(_install_dir "${CMAKE_INSTALL_DATADIR}/dbus-1/service")
foreach (_i ${_sources}) foreach (_i ${_sources})
get_filename_component(_service_file ${_i} ABSOLUTE) get_filename_component(_service_file ${_i} ABSOLUTE)
string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i}) string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})

36
pkgs/applications/networking/nextcloud-client/default.nix
View File

@ -1,17 +1,17 @@
{ lib, mkDerivation, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite { lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite
, inotify-tools, openssl, pcre, qtwebengine, libsecret , inotify-tools, openssl, pcre, qtwebengine, libsecret
, libcloudproviders , libcloudproviders
}: }:
mkDerivation rec { mkDerivation rec {
name = "nextcloud-client-${version}"; pname = "nextcloud-client";
version = "2.5.3"; version = "2.5.3";
src = fetchgit { src = fetchFromGitHub {
url = "git://github.com/nextcloud/desktop.git"; owner = "nextcloud";
rev = "refs/tags/v${version}"; repo = "desktop";
sha256 = "0fbw56bfbyk3cqv94iqfsxjf01dwy1ysjz89dri7qccs65rnjswj"; rev = "v${version}";
fetchSubmodules = true; sha256 = "1pzlq507fasf2ljf37gkw00qrig4w2r712rsy05zfwlncgcn7fnw";
}; };
patches = [ patches = [
@ -20,29 +20,15 @@ mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ]; nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl.out pcre inotify-tools libcloudproviders ]; buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl pcre inotify-tools libcloudproviders ];
enableParallelBuilding = true;
NIX_LDFLAGS = "${openssl.out}/lib/libssl.so ${openssl.out}/lib/libcrypto.so";
cmakeFlags = [
"-UCMAKE_INSTALL_LIBDIR"
"-DCMAKE_BUILD_TYPE=Release"
"-DOPENSSL_LIBRARIES=${openssl.out}/lib"
"-DOPENSSL_INCLUDE_DIR=${openssl.dev}/include"
"-DINOTIFY_LIBRARY=${inotify-tools}/lib/libinotifytools.so"
"-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include"
];
qtWrapperArgs = [ qtWrapperArgs = [
''--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}'' ''--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}''
]; ];
postInstall = '' cmakeFlags = [
sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \ "-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH
$out/share/applications/nextcloud.desktop ];
'';
meta = with lib; { meta = with lib; {
description = "Nextcloud themed desktop client"; description = "Nextcloud themed desktop client";