From 2eb7541b1acfad498b3367e2ecc0ebb4c5233b12 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Sep 2019 05:54:35 +0200
Subject: zbar: use libsForQt5.callPackage

---
 pkgs/tools/graphics/zbar/default.nix | 10 ++++++----
 pkgs/top-level/all-packages.nix      |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index 69737461929c..cb5ea25211cd 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -5,7 +5,9 @@
 , pkgconfig
 , libX11
 , libv4l
-, qt5
+, qtbase
+, qtx11extras
+, wrapQtAppsHook
 , gtk3
 , xmlto
 , docbook_xsl
@@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
     xmlto
     autoreconfHook
     docbook_xsl
-    qt5.wrapQtAppsHook
+    wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -44,8 +46,8 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals enableVideo [
     libv4l
     gtk3
-    qt5.qtbase
-    qt5.qtx11extras
+    qtbase
+    qtx11extras
   ];
 
   configureFlags = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca37025f7f31..4272504037a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7182,7 +7182,7 @@ in
 
   zbackup = callPackage ../tools/backup/zbackup {};
 
-  zbar = callPackage ../tools/graphics/zbar { };
+  zbar = libsForQt5.callPackage ../tools/graphics/zbar { };
 
   zdelta = callPackage ../tools/compression/zdelta { };
 
-- 
cgit 1.4.1