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

zbar: 0.22 -> 0.23

Browse Source
This commit is contained in:
Brice Waegeneire 2019-05-29 17:25:42 +02:00
parent 60b59c34a8
commit 4f994855e2
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,35 +1,42 @@
{ stdenv, fetchFromGitHub, imagemagickBig, pkgconfig, python2Packages, perl { stdenv, fetchFromGitHub, imagemagickBig, pkgconfig, python2Packages, perl
, libX11, libv4l, qt5, lzma, gtk2, xmlto, docbook_xsl, autoreconfHook , libX11, libv4l, qt5, lzma, gtk2, xmlto, docbook_xsl, autoreconfHook, dbus
, enableVideo ? stdenv.isLinux , enableVideo ? stdenv.isLinux, enableDbus ? stdenv.isLinux
}: }:
with stdenv.lib;
let let
inherit (python2Packages) pygtk python; inherit (python2Packages) pygtk python;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "zbar"; pname = "zbar";
version = "0.22"; version = "0.23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mchehab"; owner = "mchehab";
repo = "zbar"; repo = "zbar";
rev = version; rev = version;
sha256 = "0pz0vq6a97vnc3lcjw9k12dk2awgmws46cjfh16zin0jiz18d1xq"; sha256 = "0hlxakpyjg4q9hp7yp3har1n78341b4knwyll28hn48vykg28pza";
}; };
nativeBuildInputs = [ pkgconfig xmlto autoreconfHook docbook_xsl ]; nativeBuildInputs = [ pkgconfig xmlto autoreconfHook docbook_xsl ];
buildInputs = [ buildInputs = [
imagemagickBig python pygtk perl libX11 imagemagickBig python pygtk perl libX11
] ++ stdenv.lib.optionals enableVideo [ ] ++ optional enableDbus dbus
++ optionals enableVideo [
libv4l gtk2 qt5.qtbase qt5.qtx11extras libv4l gtk2 qt5.qtbase qt5.qtx11extras
]; ];
configureFlags = [ configureFlags = (if enableDbus then [
"--with-dbusconfdir=$out/etc/dbus-1/system.d" "--with-dbusconfdir=$out/etc/dbus-1/system.d"
] ++ stdenv.lib.optionals (!enableVideo) [ ] else [ "--without-dbus" ])
++ optionals (!enableVideo) [
"--disable-video" "--without-gtk" "--without-qt" "--disable-video" "--without-gtk" "--without-qt"
]; ];
postInstall = optionalString enableDbus ''
install -Dm644 dbus/org.linuxtv.Zbar.conf $out/etc/dbus-1/system.d/org.linuxtv.Zbar.conf
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Bar code reader"; description = "Bar code reader";
longDescription = '' longDescription = ''