diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-10 05:54:35 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-10 05:54:35 +0200 |
| commit | 2eb7541b1acfad498b3367e2ecc0ebb4c5233b12 (patch) | |
| tree | 2087868a44ca55615a36d517eba6d017dc607264 | |
| parent | 86f3b3f6282723065f15b8f7642fdcb6d6224db7 (diff) | |
| download | nixlib-2eb7541b1acfad498b3367e2ecc0ebb4c5233b12.tar nixlib-2eb7541b1acfad498b3367e2ecc0ebb4c5233b12.tar.gz nixlib-2eb7541b1acfad498b3367e2ecc0ebb4c5233b12.tar.bz2 nixlib-2eb7541b1acfad498b3367e2ecc0ebb4c5233b12.tar.lz nixlib-2eb7541b1acfad498b3367e2ecc0ebb4c5233b12.tar.xz nixlib-2eb7541b1acfad498b3367e2ecc0ebb4c5233b12.tar.zst nixlib-2eb7541b1acfad498b3367e2ecc0ebb4c5233b12.zip | |
zbar: use libsForQt5.callPackage
| -rw-r--r-- | pkgs/tools/graphics/zbar/default.nix | 10 | ||||
| -rw-r--r-- | 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 { }; |