From a28d962e11d39961552c3f6bad2e65816c2dcc31 Mon Sep 17 00:00:00 2001 From: MGlolenstine Date: Mon, 26 Jun 2023 12:08:26 +0200 Subject: [PATCH] seafile-client: 8.0.7 -> 9.0.2 --- .../networking/seafile-client/default.nix | 47 +++++++++++++------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index adda284a6b8c..faa6304c38a8 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,26 +1,45 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools -, seafile-shared, jansson, libsearpc -, withShibboleth ? true, qtwebengine }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, qtbase +, qttools +, libuuid +, seafile-shared +, jansson +, libsearpc +, withShibboleth ? true +, qtwebengine +, wrapQtAppsHook +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "seafile-client"; - version = "8.0.7"; + version = "9.0.2"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; - # Tag v8.0.7 used to point to this commit, but was re-tagged later to a state - # that fails to link properly - rev = "8b96abf64e6aa19e3beeff6b322bcd6d28120bdd"; - sha256 = "00wfr7dvbyl7pg1xgssgz8a94c7c4n5r9266lhy9qcbz456hdcgj"; + rev = "v${version}"; + sha256 = "sha256-6AsvqlXDmTr3yBvYlV/0qjH+KnZ03S5TU7yzGt0MqiI="; }; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ qtbase qttools seafile-shared jansson libsearpc ] - ++ lib.optional withShibboleth qtwebengine; + nativeBuildInputs = [ + libuuid + pkg-config + cmake + wrapQtAppsHook + qttools + ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] - ++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON"; + buildInputs = [ + seafile-shared + jansson + libsearpc + ] ++ lib.optional withShibboleth qtwebengine; + + cmakeFlags = lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON"; qtWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ seafile-shared ]}"