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

owncloud-client: build with qt5 instead of qt4

Browse Source
This commit is contained in:
Franz Pletz 2017-03-19 00:33:41 +01:00
parent 8afdae07b2
commit 2baf0a568a
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/owncloud-client/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, qt4, pkgconfig, qtkeychain, sqlite }: { stdenv, fetchurl, cmake, qt5, pkgconfig, qtkeychain, sqlite }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "owncloud-client-${version}"; name = "owncloud-client-${version}";
@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig cmake ]; nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ qt4 qtkeychain sqlite]; buildInputs = [ qt5.qtbase qt5.qtwebkit qtkeychain sqlite ];
cmakeFlags = [ cmakeFlags = [
"-UCMAKE_INSTALL_LIBDIR" "-UCMAKE_INSTALL_LIBDIR"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/top-level/all-packages.nix
View File

@ -3303,7 +3303,9 @@ with pkgs;
owncloud90 owncloud90
owncloud91; owncloud91;
owncloud-client = callPackage ../applications/networking/owncloud-client { }; owncloud-client = callPackage ../applications/networking/owncloud-client {
inherit (libsForQt5) qtkeychain;
};
p2pvc = callPackage ../applications/video/p2pvc {}; p2pvc = callPackage ../applications/video/p2pvc {};