colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zbar: use libsForQt5.callPackage

Browse Source
This commit is contained in:
Jan Tojnar 2019-09-10 05:54:35 +02:00
parent 86f3b3f628
commit 2eb7541b1a
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/graphics/zbar/default.nix
View File

@ -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 = [

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };