diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/owncloud-client/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 1323c3121214..ccd1b5cfeae4 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, qtkeychain, sqlite }: +{ stdenv, fetchurl, cmake, qt5, pkgconfig, qtkeychain, sqlite }: stdenv.mkDerivation rec { name = "owncloud-client-${version}"; @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ qt4 qtkeychain sqlite]; + buildInputs = [ qt5.qtbase qt5.qtwebkit qtkeychain sqlite ]; cmakeFlags = [ - "-UCMAKE_INSTALL_LIBDIR" + "-UCMAKE_INSTALL_LIBDIR" ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5b1dcd757d3..5c832dff9f28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3303,7 +3303,9 @@ with pkgs; owncloud90 owncloud91; - owncloud-client = callPackage ../applications/networking/owncloud-client { }; + owncloud-client = callPackage ../applications/networking/owncloud-client { + inherit (libsForQt5) qtkeychain; + }; p2pvc = callPackage ../applications/video/p2pvc {}; |