diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-19 20:12:01 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-20 07:56:42 -0600 |
commit | 700546fd12c767e61f8adcc458a3abbc7f6c97d8 (patch) | |
tree | b74c50328e1f6d9647d33b52d07cb9831772331d | |
parent | ad9ece4f921af0e0bb3183887d64c121d9133207 (diff) | |
download | nixlib-700546fd12c767e61f8adcc458a3abbc7f6c97d8.tar nixlib-700546fd12c767e61f8adcc458a3abbc7f6c97d8.tar.gz nixlib-700546fd12c767e61f8adcc458a3abbc7f6c97d8.tar.bz2 nixlib-700546fd12c767e61f8adcc458a3abbc7f6c97d8.tar.lz nixlib-700546fd12c767e61f8adcc458a3abbc7f6c97d8.tar.xz nixlib-700546fd12c767e61f8adcc458a3abbc7f6c97d8.tar.zst nixlib-700546fd12c767e61f8adcc458a3abbc7f6c97d8.zip |
zeal: Qt 5 infrastructure update
-rw-r--r-- | pkgs/data/documentation/zeal/default.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index a6c77deb12ea..0f02bb7dc945 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xorg }: +{ stdenv, fetchFromGitHub, libarchive, pkgconfig, qtbase +, qtimageformats, qtwebkit, xorg }: stdenv.mkDerivation rec { version = "0.1.1"; @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - xorg.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive + xorg.xcbutilkeysyms pkgconfig qtbase qtimageformats qtwebkit libarchive ]; configurePhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d70a6303086..5dfe42b989ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10929,7 +10929,7 @@ let xlsx2csv = pythonPackages.xlsx2csv; - zeal = callPackage ../data/documentation/zeal { }; + zeal = qt5.callPackage ../data/documentation/zeal { }; ### APPLICATIONS |