Commit Graph

35 Commits

Author SHA1 Message Date
Robin Gloster
ab0cfd9e03
treewide: NIX_*_COMPILE -> string 2019-12-31 00:10:18 +01:00
Vladimír Čunát
6c567ed797
Merge branch 'staging-next' into staging 2019-09-22 10:06:45 +02:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Vladimír Čunát
41af38f372
Merge branch 'staging-next' 2019-09-21 13:14:09 +02:00
Pierre Bourdon
18b607b71b
zbar: disable Qt assertions
Greatly decreases zbar-lib transitive closure size: assertion messages
contain paths to Qt header files, causing zbar-lib to depend on
qtbase-dev.

The Qt specific mkDerivation normally does this automatically, but we
can't use it here due to having only a small part of the project being
Qt related.
2019-09-21 03:46:57 +02:00
worldofpeace
ac0e914fdc zbar: Move D-Bus conf file to share/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
2019-09-16 13:59:09 -04:00
Jan Tojnar
9b6789de73
tree-wide: replace wrapProgram with wrapGApp
where appropriate
2019-09-10 17:54:57 +02:00
Jan Tojnar
2eb7541b1a
zbar: use libsForQt5.callPackage 2019-09-10 05:54:35 +02:00
Jan Tojnar
86f3b3f628
zbar: drop Perl dependency
It does not appear to be necessary
2019-09-10 01:56:40 +02:00
Jan Tojnar
021faed5ba
zbar: switch to GTK 3 2019-09-10 01:56:40 +02:00
Jan Tojnar
61fdd203d6
zbar: wrap Qt frontend 2019-09-10 01:56:40 +02:00
Jan Tojnar
da135c2704
zbar: drop pygtk support
It is deprecated and we do not actually use it anywhere
2019-09-10 01:56:39 +02:00
Jan Tojnar
e1cb839d17
zbar: Split to multiple outputs
Also fix D-Bus config dir path: The configure script is appending `/dbus-1/system.d`
so when we added passed in `$out/etc/dbus-1/system.d`, it ended up with extra nesting.
2019-09-10 01:34:50 +02:00
Jan Tojnar
41fbd55689
zbar: format with nixpkgs-fmt 2019-09-10 00:32:22 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Brice Waegeneire
4f994855e2 zbar: 0.22 -> 0.23 2019-05-29 17:25:42 +02:00
Pierre Bourdon
57ffe86efa
zbar: 0.10 -> 0.22
The original upstream at http://zbar.sourceforge.net/ has not produced a
new release or a new commit on their repository in about 7 years. Most
distros (Debian, Gentoo, Arch, ...) have switched already to the more
maintained fork at https://github.com/mchehab/zbar

Update dependencies from qt4 to qt5, reducing "electrum" closure size in
the process (now only depends on one Qt version).
2019-03-25 10:28:34 +01:00
John Wiegley
7147ef8e80 zbar: Enable building on darwin by disabling video support there 2018-01-03 12:40:33 -08:00
Frederik Rietdijk
472c25cfa2 zbar: use python2 2017-01-11 18:25:10 +01:00
Frederik Rietdijk
ee510f201d zbar: do not use top-level python packages 2016-09-26 11:10:50 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Bjørn Forsman
65ccda5b96 zbar: fix camera support (enables 'zbarcam' tool)
Add Debian patches (with fetchpatch) to make things work. Among other
things, the patches port the application from V4L to V4L2.

This increases the closure size from 729 MiB to 730 MiB.
2016-05-31 09:31:41 +02:00
Michael Raskin
942db2e9ac imagemagick: libwebp just has to be a propagated input 2016-05-04 17:55:09 +02:00
Michael Raskin
9dfaf885c6 zbar: pass libwebp WebP image format library 2016-05-04 13:06:17 +02:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
4447e42f02 zbar: disable fortify hardening 2016-02-24 15:17:41 +00:00
Pascal Wittmann
6d25c0f1b3 Remove unneeded 'with's from meta.platforms 2015-11-25 23:06:09 +01:00
Joachim Fasting
b0e5edae35 zbar: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Luca Bruno
271b7ad006 Revert "zbar: ghostscript was missing for zbar"
This reverts commit a906355b8a.

Fixed imagemagick -lgs reference in .la file.

cc @garbas
2015-09-03 12:21:34 +02:00
Rok Garbas
a906355b8a zbar: ghostscript was missing for zbar 2015-09-03 03:41:00 +02:00
Bjørn Forsman
6ec01b7513 zbar: tweak description and add longDescription
"Bar code reader" is what they call it on the homepage
(http://zbar.sourceforge.net/).
2014-06-23 16:02:45 +02:00
Michael Raskin
3c1ce85692 Fix ZBar build by passing it gtk2 2013-03-21 11:59:07 +04:00
Michael Raskin
dcf04b6063 zbar requires v4l1; disabe video 2013-03-09 12:59:45 +04:00
Michael Raskin
09114ea858 Adding ZBar
svn path=/nixpkgs/trunk/; revision=29001
2011-09-04 09:12:00 +00:00