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

Merge pull request #67270 from greizgh/qt/seafile-client

Browse source 
seafile-client: Use qt5's mkDerivation
This commit is contained in:
worldofpeace 2019-08-23 10:33:22 -04:00 committed by GitHub
commit 3fffe5a1ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/applications/networking/seafile-client/default.nix
View file

@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools { stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
, seafile-shared, ccnet, makeWrapper , seafile-shared, ccnet
, withShibboleth ? true, qtwebengine }: , withShibboleth ? true, qtwebengine }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { mkDerivation rec {
version = "6.2.11"; version = "6.2.11";
name = "seafile-client-${version}"; name = "seafile-client-${version}";
@ -15,17 +15,16 @@ stdenv.mkDerivation rec {
sha256 = "1b8jqmr2qd3bpb3sr4p5w2a76x5zlknkj922sxrvw1rdwqhkb2pj"; sha256 = "1b8jqmr2qd3bpb3sr4p5w2a76x5zlknkj922sxrvw1rdwqhkb2pj";
}; };
nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ qtbase qttools seafile-shared ] buildInputs = [ qtbase qttools seafile-shared ]
++ optional withShibboleth qtwebengine; ++ optional withShibboleth qtwebengine;
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]
++ optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON"; ++ optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON";
postInstall = '' qtWrapperArgs = [
wrapProgram $out/bin/seafile-applet \ "--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}"
--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]} ];
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/haiwen/seafile-client; homepage = https://github.com/haiwen/seafile-client;