diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-04-30 19:53:17 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-04-30 20:19:57 +0200 |
| commit | fdcb4fa4b8d100215c1fa6cb1fc585d7476740c1 (patch) | |
| tree | e3a73af89ff9d5cba10b22de9cb4ce665eb49c30 | |
| parent | 9ef3ecb80feb77e4db421de2ecff88bfef50ee2e (diff) | |
| download | nixlib-fdcb4fa4b8d100215c1fa6cb1fc585d7476740c1.tar nixlib-fdcb4fa4b8d100215c1fa6cb1fc585d7476740c1.tar.gz nixlib-fdcb4fa4b8d100215c1fa6cb1fc585d7476740c1.tar.bz2 nixlib-fdcb4fa4b8d100215c1fa6cb1fc585d7476740c1.tar.lz nixlib-fdcb4fa4b8d100215c1fa6cb1fc585d7476740c1.tar.xz nixlib-fdcb4fa4b8d100215c1fa6cb1fc585d7476740c1.tar.zst nixlib-fdcb4fa4b8d100215c1fa6cb1fc585d7476740c1.zip | |
owncloud-client: unbreak build (qt58 -> qt56)
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).
| -rw-r--r-- | pkgs/applications/networking/owncloud-client/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index ccd1b5cfeae4..fd7aef1414ea 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a51e5d664b85..3d13173dc5f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {}; |