git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #58247 from delroth/zbar-0.22

zbar: 0.10 -> 0.22 (new upstream)

commit3791a20e9783815ec18b790d3848aaabf729085c authorMichael Raskin <7c6f434c@mail.ru> dateMon 25 Mar 2019, 09:56 (8 years ago) parent7c9e22557ffe86
1 file changed+20−44
pkgs/tools/graphics/zbar/default.nix+20−44
pkgs/tools/graphics/zbar/default.nix+20−44
@@ -1,53 +1,35 @@
1−{ stdenv, fetchurl, imagemagickBig, pkgconfig, python2Packages, perl
2−, libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook
1+{ stdenv, fetchFromGitHub, imagemagickBig, pkgconfig, python2Packages, perl
2+, libX11, libv4l, qt5, lzma, gtk2, xmlto, docbook_xsl, autoreconfHook
33, enableVideo ? stdenv.isLinux
44}:
55
66let
77 inherit (python2Packages) pygtk python;
88in stdenv.mkDerivation rec {
9− name = "${pname}-${version}";
109 pname = "zbar";
11− version = "0.10";
12− src = fetchurl {
13− url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${name}.tar.bz2";
14− sha256 = "1imdvf5k34g1x2zr6975basczkz3zdxg6xnci50yyp5yvcwznki3";
10+ version = "0.22";
11+
12+ src = fetchFromGitHub {
13+ owner = "mchehab";
14+ repo = "zbar";
15+ rev = version;
16+ sha256 = "0pz0vq6a97vnc3lcjw9k12dk2awgmws46cjfh16zin0jiz18d1xq";
1517 };
1618
17− patches = [
18− (fetchpatch {
19− name = "0001-Description-Linux-2.6.38-and-later-do-not-support-th.patch";
20− url = "https://git.recluse.de/raw/debian/pkg-zbar.git/35182c3ac2430c986579b25f1826fe1b7dfd15de/debian!patches!0001-Description-Linux-2.6.38-and-later-do-not-support-th.patch";
21− sha256 = "1zy1wdyhmpw877pv6slfhjy0c6dm0gxli0i4zs1akpvh052j4a69";
22− })
23− (fetchpatch {
24− name = "python-zbar-import-fix-am.patch";
25− url = "https://git.recluse.de/raw/debian/pkg-zbar.git/1f15f52e53ee0bf7b4761d673dc859c6b10e6be5/debian!patches!python-zbar-import-fix-am.patch";
26− sha256 = "15xx9ms137hvwpynbgvbc6zgmmzfaf7331rfhls24rgbnywbgirx";
27− })
28− (fetchpatch {
29− name = "new_autotools_build_fix.patch";
30− url = "https://git.recluse.de/raw/debian/pkg-zbar.git/2c641cc94d4f728421ed750d95d6d1c2d06a534d/debian!patches!new_autotools_build_fix.patch";
31− sha256 = "0jhl5jnnjhfdv51xqimkbkdvj8d38z05fhd11yx1sgmw82f965s3";
32− })
33− (fetchpatch {
34− name = "threading-fix.patch";
35− url = "https://git.recluse.de/raw/debian/pkg-zbar.git/d3eba6e2c3acb0758d19519015bf1a53ffb8e645/debian!patches!threading-fix.patch";
36− sha256 = "1jjgrx9nc7788vfriai4z26mm106sg5ylm2w5rdyrwx7420x1wh7";
37− })
38− ];
19+ nativeBuildInputs = [ pkgconfig xmlto autoreconfHook docbook_xsl ];
3920
40− buildInputs =
41− [ imagemagickBig pkgconfig python pygtk perl libX11
42− lzma autoreconfHook ] ++
43− stdenv.lib.optionals enableVideo [ libv4l gtk2 qt4 ];
21+ buildInputs = [
22+ imagemagickBig python pygtk perl libX11
23+ ] ++ stdenv.lib.optionals enableVideo [
24+ libv4l gtk2 qt5.qtbase qt5.qtx11extras
25+ ];
4426
45− configureFlags = stdenv.lib.optionals (!enableVideo) [
27+ configureFlags = [
28+ "--with-dbusconfdir=$out/etc/dbus-1/system.d"
29+ ] ++ stdenv.lib.optionals (!enableVideo) [
4630 "--disable-video" "--without-gtk" "--without-qt"
4731 ];
4832
49− hardeningDisable = [ "fortify" ];
50−
5133 meta = with stdenv.lib; {
5234 description = "Bar code reader";
5335 longDescription = ''
@@ -57,15 +39,9 @@ in stdenv.mkDerivation rec {
5739 EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR
5840 Code.
5941 '';
60− maintainers = with maintainers; [ raskin ];
42+ maintainers = with maintainers; [ delroth raskin ];
6143 platforms = platforms.unix;
6244 license = licenses.lgpl21;
63− homepage = http://zbar.sourceforge.net/;
64− };
65−
66− passthru = {
67− updateInfo = {
68− downloadPage = "http://zbar.sourceforge.net/";
69− };
45+ homepage = https://github.com/mchehab/zbar;
7046 };
7147}