From 700546fd12c767e61f8adcc458a3abbc7f6c97d8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 20:12:01 -0600 Subject: [PATCH] zeal: Qt 5 infrastructure update --- pkgs/data/documentation/zeal/default.nix | 5 +++-- 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 a6c77deb12e..0f02bb7dc94 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 2d70a630308..5dfe42b989a 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