3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

14 commits

Author SHA1 Message Date
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