alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

owncloud-client: unbreak build (qt58 -> qt56)

Browse source 
The build fails due to missing qt linguist tools. That's solved by
adding 'qttools'. But the build fails soon after with missing 'Sql'
module. I didn't manage to solve that, so use Qt 5.6 where it works.

Using libsForQt seems to be the way Qt packages are composed today, so
use that (seems safer).
This commit is contained in:
Bjørn Forsman 2017-04-30 19:53:17 +02:00
parent 9ef3ecb80f
commit fdcb4fa4b8
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/owncloud-client/default.nix
View file

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

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

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