forked from mirrors/nixpkgs
Update Data Matrix library and ifx its build
svn path=/nixpkgs/trunk/; revision=20139
This commit is contained in:
parent
9727f3d707
commit
7db8225aed
|
@ -24,8 +24,8 @@ rec {
|
||||||
squid3Beta = squid30.merge {
|
squid3Beta = squid30.merge {
|
||||||
name = "squid-3.1-beta";
|
name = "squid-3.1-beta";
|
||||||
src = args.fetchurl {
|
src = args.fetchurl {
|
||||||
url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.6.tar.bz2;
|
url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.16.tar.bz2;
|
||||||
sha256 = "0crkfd5kc677baq0v6kfnwh0rc7h2a1083yh0sccy7g02vd7z3q5";
|
sha256 = "0pjz8dj04146hgdlfh0hbwdsdahsicdkafj5z9nkghbjavj1x5ny";
|
||||||
};
|
};
|
||||||
configureFlags = ["--enable-ipv6"];
|
configureFlags = ["--enable-ipv6"];
|
||||||
};
|
};
|
||||||
|
|
|
@ -3,16 +3,17 @@ let
|
||||||
lib = args.lib;
|
lib = args.lib;
|
||||||
fetchurl = args.fetchurl;
|
fetchurl = args.fetchurl;
|
||||||
|
|
||||||
version = lib.attrByPath ["version"] "0.7.0" args;
|
version = lib.attrByPath ["version"] "0.7.2" args;
|
||||||
buildInputs = with args; [
|
buildInputs = with args; [
|
||||||
libpng libtiff libjpeg librsvg imagemagick pkgconfig
|
libpng libtiff libjpeg librsvg imagemagick pkgconfig
|
||||||
zlib libX11 bzip2 libtool
|
zlib libX11 bzip2 libtool freetype fontconfig
|
||||||
|
ghostscript
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://prdownloads.sourceforge.net/libdmtx/libdmtx-${version}.tar.bz2";
|
url = "http://prdownloads.sourceforge.net/libdmtx/libdmtx-${version}.tar.bz2";
|
||||||
sha256 = "00w0pvpbwqqa1c8s85v8vf8w1x116yh7qg5fplxj5jhmfizcama2";
|
sha256 = "0iin2j3ad7ldj32dwc04g28k54iv3lrc5121rgyphm7l9hvigbvk";
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit buildInputs;
|
inherit buildInputs;
|
||||||
|
|
|
@ -6948,7 +6948,8 @@ let
|
||||||
|
|
||||||
dmtx = builderDefsPackage (import ../tools/graphics/dmtx) {
|
dmtx = builderDefsPackage (import ../tools/graphics/dmtx) {
|
||||||
inherit libpng libtiff libjpeg imagemagick librsvg
|
inherit libpng libtiff libjpeg imagemagick librsvg
|
||||||
pkgconfig bzip2 zlib libtool;
|
pkgconfig bzip2 zlib libtool freetype fontconfig
|
||||||
|
ghostscript;
|
||||||
inherit (xlibs) libX11;
|
inherit (xlibs) libX11;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue