diff options
Diffstat (limited to 'pkgs/development/libraries')
31 files changed, 170 insertions, 104 deletions
diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index c76115000cb0..78867881dc32 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind"; }; - patches = [ ./CVE-2015-7747.patch ]; + patches = [ ./CVE-2015-7747.patch ./gcc-6.patch ]; meta = with stdenv.lib; { description = "Library for reading and writing audio files in various formats"; diff --git a/pkgs/development/libraries/audiofile/gcc-6.patch b/pkgs/development/libraries/audiofile/gcc-6.patch new file mode 100644 index 000000000000..1a7edd5af9a1 --- /dev/null +++ b/pkgs/development/libraries/audiofile/gcc-6.patch @@ -0,0 +1,30 @@ +http://patchwork.ozlabs.org/patch/630200/ + +From 28cfdbbcb96a69087c3d21faf69b5eae7bcf6d69 Mon Sep 17 00:00:00 2001 +From: Hodorgasm <nsane457@gmail.com> +Date: Wed, 11 May 2016 21:42:07 -0400 +Subject: [PATCH] Cast to unsigned while left bit-shifting + +GCC-6 now treats the left bitwise-shift of a negative integer as nonconformant so explicitly cast to an unsigned int while bit-shifting. + +Downloaded from upstream PR: +https://github.com/mpruett/audiofile/pull/28 + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> +--- + libaudiofile/modules/SimpleModule.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libaudiofile/modules/SimpleModule.h b/libaudiofile/modules/SimpleModule.h +index 03c6c69..4014fb2 100644 +--- a/libaudiofile/modules/SimpleModule.h ++++ b/libaudiofile/modules/SimpleModule.h +@@ -123,7 +123,7 @@ struct signConverter + typedef typename IntTypes<Format>::UnsignedType UnsignedType; + + static const int kScaleBits = (Format + 1) * CHAR_BIT - 1; +- static const int kMinSignedValue = -1 << kScaleBits; ++ static const int kMinSignedValue = static_cast<signed>(static_cast<unsigned>(-1) << kScaleBits);; + + struct signedToUnsigned : public std::unary_function<SignedType, UnsignedType> + { diff --git a/pkgs/development/libraries/db/clang-4.8.patch b/pkgs/development/libraries/db/clang-4.8.patch index bbb778914977..aa46b8500b5a 100644 --- a/pkgs/development/libraries/db/clang-4.8.patch +++ b/pkgs/development/libraries/db/clang-4.8.patch @@ -38,19 +38,6 @@ index 0034dcc..160c8ea 100644 #else #define atomic_inc(env, p) __atomic_inc(env, p) #define atomic_dec(env, p) __atomic_dec(env, p) -diff --git a/dbinc/db.in b/dbinc/db.in -index 9fc6712..7428e0a 100644 ---- a/dbinc/db.in -+++ b/dbinc/db.in -@@ -2413,7 +2413,7 @@ typedef struct { - #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) - #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ - #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) --#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) -+#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) - - /******************************************************* - * Hsearch historic interface. diff --git a/mp/mp_fget.c b/mp/mp_fget.c index 5fdee5a..0b75f57 100644 --- a/mp/mp_fget.c diff --git a/pkgs/development/libraries/db/clang-5.3.patch b/pkgs/development/libraries/db/clang-5.3.patch index 1cfb13ca8e68..caf19ffeb92b 100644 --- a/pkgs/development/libraries/db/clang-5.3.patch +++ b/pkgs/development/libraries/db/clang-5.3.patch @@ -38,19 +38,6 @@ index 6a858f7..9f338dc 100644 #else #define atomic_inc(env, p) __atomic_inc(env, p) #define atomic_dec(env, p) __atomic_dec(env, p) -diff --git a/src/dbinc/db.in b/src/dbinc/db.in -index 92ac822..f80428e 100644 ---- a/src/dbinc/db.in -+++ b/src/dbinc/db.in -@@ -2782,7 +2782,7 @@ typedef struct { - #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) - #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ - #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) --#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) -+#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) - - /******************************************************* - * Hsearch historic interface. diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c index 16de695..d0dcc29 100644 --- a/src/mp/mp_fget.c diff --git a/pkgs/development/libraries/db/clang-6.0.patch b/pkgs/development/libraries/db/clang-6.0.patch index 5c1e8f506c4e..a411e60dc39b 100644 --- a/pkgs/development/libraries/db/clang-6.0.patch +++ b/pkgs/development/libraries/db/clang-6.0.patch @@ -20,19 +20,6 @@ index e4420aa..4799b5f 100644 #else #define atomic_inc(env, p) __atomic_inc_int(env, p) #define atomic_dec(env, p) __atomic_dec_int(env, p) -diff --git a/src/dbinc/db.in b/src/dbinc/db.in -index 3c2ad9b..3e46f02 100644 ---- a/src/dbinc/db.in -+++ b/src/dbinc/db.in -@@ -2999,7 +2999,7 @@ typedef struct { - #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) - #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ - #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) --#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) -+#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) - - /******************************************************* - * Hsearch historic interface. diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c index 59fe9fe..fa4ced7 100644 --- a/src/mp/mp_fget.c diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index a6f9c676bba0..c32045559019 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl , cxxSupport ? true , compat185 ? true +, dbmSupport ? false # Options from inherited versions , version, sha256 @@ -19,12 +20,13 @@ stdenv.mkDerivation (rec { patches = extraPatches; - configureFlags = [ - (if cxxSupport then "--enable-cxx" else "--disable-cxx") - (if compat185 then "--enable-compat185" else "--disable-compat185") - "--enable-dbm" - (stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic") - ]; + configureFlags = + [ + (if cxxSupport then "--enable-cxx" else "--disable-cxx") + (if compat185 then "--enable-compat185" else "--disable-compat185") + ] + ++ stdenv.lib.optional dbmSupport "--enable-dbm" + ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; preConfigure = '' cd build_unix diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix index ac94e077b9a6..7b42ead14bd8 100644 --- a/pkgs/development/libraries/dirac/default.nix +++ b/pkgs/development/libraries/dirac/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { patches = [ ./dirac-1.0.2.patch ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + postInstall = '' # keep only necessary binaries find $out/bin \( -name '*RGB*' -or -name '*YUV*' -or -name create_dirac_testfile.pl \) -delete diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 42105c7022c2..6ee7670fc296 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,11 +1,15 @@ -{stdenv, fetchurl, unzip, darwin}: +{ stdenv, fetchurl, unzip, darwin }: + stdenv.mkDerivation { name = "freeimage-3.17.0"; + src = fetchurl { url = mirror://sourceforge/freeimage/FreeImage3170.zip; sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v"; }; + buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + prePatch = if stdenv.isDarwin then '' sed -e 's/gcc-4.0/clang/g' \ @@ -38,6 +42,8 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/include $out/lib"; postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip install"; + NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + meta = { description = "Open Source library for accessing popular graphics image file formats"; homepage = http://freeimage.sourceforge.net/; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index d63a1bb75726..de7111f6be36 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,24 +1,17 @@ -{ composableDerivation, fetchurl, python }: +{ stdenv, fetchurl, fetchpatch, python }: -let inherit (composableDerivation) edf; in - -composableDerivation.composableDerivation {} rec { - - flags = - # python and ruby untested - edf { name = "python"; enable = { buildInputs = [ python ]; }; }; - # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else []) - # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };} - - name = "geos-3.5.0"; +stdenv.mkDerivation rec { + name = "geos-3.6.1"; src = fetchurl { url = "http://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "49982b23bcfa64a53333dab136b82e25354edeb806e5a2e2f5b8aa98b1d0ae02"; + sha256 = "1icz31kd5sml2kdxhjznvmv33zfr6nig9l0i6bdcz9q9g8x4wbja"; }; enableParallelBuilding = true; + buildInputs = [ python ]; + meta = { description = "C++ port of the Java Topology Suite (JTS)"; homepage = http://geos.refractions.net/; diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix index 8796a5f67404..e908c9b5b134 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror, gobjectIntrospection }: stdenv.mkDerivation rec { - name = "gmime-2.6.20"; + name = "gmime-2.6.23"; src = fetchurl { url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz"; - sha256 = "0rfzbgsh8ira5p76kdghygl5i3fvmmx4wbw5rp7f8ajc4vxp18g0"; + sha256 = "0slzlzcr3h8jikpz5a5amqd0csqh2m40gdk910ws2hnaf5m6hjbi"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index aa644a3a4a83..6425749d0417 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnu-efi-${version}"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2"; - sha256 = "1bzq5czw5dxlvpgs9ij2iz7q6krwhja87vc982r6vffcqcl0982i"; + sha256 = "08hb2gpzcj5p743wcagm0j2m4gh100xv12llpbjc13zi2icwv3xx"; }; patches = optional stdenv.isAarch64 ./aarch64-fix-discarded-qualifier.patch; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 8acc773a46c8..307fde4e5c27 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -9,11 +9,11 @@ let gpgProgram = if useGnupg1 then "gpg" else "gpg2"; in stdenv.mkDerivation rec { - name = "gpgme-1.7.0"; + name = "gpgme-1.8.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "0j6capvv6lcr6p763lr2ygzkzkj5lqm7fnbfc1xaygib1znmzxbi"; + sha256 = "0csx3qnycwm0n90ql6gs65if5xi4gqyzzy21fxs2xqicghjrfq2r"; }; outputs = [ "out" "dev" "info" ]; @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gnupg ]; configureFlags = [ - "--with-gpg=${gpgStorePath}/bin/${gpgProgram}" "--enable-fixed-path=${gpgStorePath}/bin" ]; diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index 02195dede936..1e374b8ad1fd 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; meta = { inherit (s) version; description = ''Library for import of reflowable e-book formats''; diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index 16ee2151faa5..c620254aacd6 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { makeFlagsArray+=(PREFIX="$out" LIBDIRNAME=/lib) ''; + # Work around "libfaketime.c:513:7: error: nonnull argument 'buf' compared to NULL [-Werror=nonnull-compare]". + NIX_CFLAGS_COMPILE = "-Wno-nonnull-compare"; + meta = with stdenv.lib; { description = "Report faked system time to programs without having to change the system-wide time"; homepage = http://www.code-wizards.com/projects/libfaketime/; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index f05257898964..fc2c859a5f87 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.7.5"; + version = "1.7.6"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "0078pbzm6nlgvnwlylshsg707ifcmfpnpbvhlhqbpwpfic9a9zni"; + sha256 = "1g05prhgqw4ryd0w433q8nhds0h93kf47hfjagi2r7dghkpaysk2"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index d81a59a5c621..afa064881a66 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libgpg-error-${version}"; - version = "1.24"; + version = "1.26"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "0h75sf1ngr750c3fjfn4583q7wz40qm63jhg8vjfdrbx936f2s4j"; + sha256 = "0sgfia0syq78k1c9h10rkhc1nfv5v097icrprlx2x4qn074wnjsc"; }; postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index fedc5287b49b..10979abdeabc 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,13 +2,20 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.17.1"; + version = "0.17.2"; src = fetchurl { url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "18fygk896gxbx47nh2rn5jp4skisgkl6pdfjqb7h0zn39hd6b6g5"; + sha256 = "0p6imxpsfn82i0i9w27fnzq6q6gwzvb9f7sygqqakv36fqnc9c4j"; }; + patches = + [ (fetchurl { + url = https://anonscm.debian.org/cgit/pkg-phototools/libraw.git/plain/debian/patches/0001-Fix_gcc6_narrowing_conversion.patch?id=d890937aaca6359df45a66b35e547c94ca564823; + sha256 = "1lcg5l0wmwiyzhhm67c1c7hy8py6ihxfmicnhrwpi3i6f16vq29w"; + }) + ]; + outputs = [ "out" "lib" "dev" "doc" ]; buildInputs = [ jasper ]; diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 150e7455c032..3b74406d7bf1 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -5,16 +5,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "681a4d9a0d259f2125713f2e5766c5809f151b3a1392fd91390f780b4b8f5a02"; + sha256 = "00jsix5hny0g768zv4hk78dib7w0qmk5fbizf4jj37r51nd4s6k8"; }; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - # Warning causes build to fail on darwin since 4.9, - # check if this can be removed in the next release. - CFLAGS = "-Wno-sign-compare"; - buildInputs = [ perl texinfo ]; doCheck = true; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 8cba1a38b5ba..031ac781651c 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "libva-${version}"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "04rczbnbi70y1ziy9ab59szi3glk9q35hshlws0bcj2ndbqirmjx"; + sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 80019d52f4f0..f1171a6a6185 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchzip }: +{ stdenv, fetchFromGitHub }: let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "lmdb-${version}"; - version = "0.9.18"; + version = "0.9.19"; - src = fetchzip { - url = "https://github.com/LMDB/lmdb/archive/LMDB_${version}.tar.gz"; - sha256 = "01j384kxg36kym060pybr5p6mjw0xv33bqbb8arncdkdq57xk8wg"; + src = fetchFromGitHub { + owner = "LMDB"; + repo = "lmdb"; + rev = "LMDB_${version}"; + sha256 = "04qx803jdmhkcam748fn0az3cyzvj91lw28kcvwfyq0al7pmjkfs"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index 0c28a921995b..8ebf62cfdf0e 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "npth-1.2"; + name = "npth-1.3"; src = fetchurl { url = "ftp://ftp.gnupg.org/gcrypt/npth/${name}.tar.bz2"; - sha256 = "12n0nvhw4fzwp0k7gjv3rc6pdml0qiinbbfiz4ilg6pl5kdxvnvd"; + sha256 = "0am86vblapwz84254qpmhz0chk70g6qzh3wdxcs0gvba8d01ka5w"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 0b67ce16331c..b68bc20ecf35 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig -, openssl, libpng, lua5 }: +, gcc5, openssl, libpng, lua5 }: stdenv.mkDerivation rec { - name = "podofo-0.9.3"; + name = "podofo-0.9.4"; src = fetchurl { url = "mirror://sourceforge/podofo/${name}.tar.gz"; - sha256 = "1n12lbq9x15vqn7dc0hsccp56l5jdff1xrhvlfqlbklxx0qiw9pc"; + sha256 = "0ngqgwl38afmzcj2zpf18a2g63vhm2fp45cbf9z62129rdgm1pyc"; }; propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gcc5 ]; buildInputs = [ lua5 stdenv.cc.libc ]; crossAttrs = { diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix index f80acf462b85..4e77e7f1fbee 100644 --- a/pkgs/development/libraries/protobuf/3.0.nix +++ b/pkgs/development/libraries/protobuf/3.0.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.0.0"; - sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7"; + version = "3.0.2"; + sha256 = "16wmr1fgdqpf84fkq90cxvccfsxx7h0q0wzqkbg8vdjmka412g09"; } diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index f74aea9dbd57..39cf0a1741d6 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { doCheck = true; + NIX_CFLAGS_COMPILE = with stdenv.lib; + # gcc before 6 doesn't know this option + optionalString (hasPrefix "gcc-6" stdenv.cc.cc) "-Wno-error=misleading-indentation"; + meta = { description = "Google's data interchange format"; longDescription = diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 91a8899f4d13..cfb4ac614599 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -80,12 +80,19 @@ stdenv.mkDerivation rec { gtk = gtk2.out; gdk_pixbuf = gdk_pixbuf.out; }) - ++ [(fetchpatch { + ++ [ + (fetchpatch { name = "fix-medium-font.patch"; url = "http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/plain/debian/patches/" + "kubuntu_39_fix_medium_font.diff?id=21b342d71c19e6d68b649947f913410fe6129ea4"; sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j"; - })]; + }) + (fetchpatch { + name = "qt4-gcc6.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; + sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; + }) + ]; preConfigure = '' export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" @@ -145,8 +152,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - NIX_CFLAGS_COMPILE = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) - "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include" + NIX_CFLAGS_COMPILE = "-std=gnu++98" + + optionalString (stdenv.isFreeBSD || stdenv.isDarwin) + "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include" + optionalString stdenv.isDarwin " -I${libcxx}/include/c++/v1"; NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 6803dfd76de9..f248d65e2ed6 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -10,9 +10,12 @@ stdenv.mkDerivation rec { sha256 = "0ynwn7ih5l2b1kpzpibns9bb9wzfjak7mgrb1ji0dkn2q5pv6lr0"; }; - enableParallelBuilding = true; + patches = [ + ./format.patch + ./gcc6.patch + ]; - hardeningDisable = [ "format" ]; + enableParallelBuilding = true; buildInputs = [ SDL gtk2 mesa ]; diff --git a/pkgs/development/libraries/smpeg/format.patch b/pkgs/development/libraries/smpeg/format.patch new file mode 100644 index 000000000000..8486dee5cda4 --- /dev/null +++ b/pkgs/development/libraries/smpeg/format.patch @@ -0,0 +1,11 @@ +--- a/plaympeg.c 2014-09-04 08:55:10.646132150 +0200 ++++ b/plaympeg.c 2014-09-04 08:56:57.465210820 +0200 +@@ -262,7 +262,7 @@ + answer[i] = c; + } + answer[i] = 0; +- fprintf(stderr, answer + 4); ++ fprintf(stderr, "%s", answer + 4); + } + while(answer[3] == '-'); + diff --git a/pkgs/development/libraries/smpeg/gcc6.patch b/pkgs/development/libraries/smpeg/gcc6.patch new file mode 100644 index 000000000000..165feb4428c2 --- /dev/null +++ b/pkgs/development/libraries/smpeg/gcc6.patch @@ -0,0 +1,33 @@ +--- a/audio/hufftable.cpp ++++ b/audio/hufftable.cpp +@@ -9,6 +9,7 @@ + #include "config.h" + #endif + ++#include <climits> + #include "MPEGaudio.h" + + static const unsigned int +@@ -550,11 +551,11 @@ htd33[ 31][2]={{ 16, 1},{ 8, 1},{ 4, + + const HUFFMANCODETABLE MPEGaudio::ht[HTN]= + { +- { 0, 0-1, 0-1, 0, 0, htd33}, ++ { 0, UINT_MAX, UINT_MAX, 0, 0, htd33}, + { 1, 2-1, 2-1, 0, 7,htd01}, + { 2, 3-1, 3-1, 0, 17,htd02}, + { 3, 3-1, 3-1, 0, 17,htd03}, +- { 4, 0-1, 0-1, 0, 0, htd33}, ++ { 4, UINT_MAX, UINT_MAX, 0, 0, htd33}, + { 5, 4-1, 4-1, 0, 31,htd05}, + { 6, 4-1, 4-1, 0, 31,htd06}, + { 7, 6-1, 6-1, 0, 71,htd07}, +@@ -564,7 +565,7 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN + {11, 8-1, 8-1, 0,127,htd11}, + {12, 8-1, 8-1, 0,127,htd12}, + {13,16-1,16-1, 0,511,htd13}, +- {14, 0-1, 0-1, 0, 0, htd33}, ++ {14, UINT_MAX, UINT_MAX, 0, 0, htd33}, + {15,16-1,16-1, 0,511,htd15}, + {16,16-1,16-1, 1,511,htd16}, + {17,16-1,16-1, 2,511,htd16}, diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index e3a7124720b0..df68b86519b7 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libva-intel-driver-1.7.2"; + name = "libva-intel-driver-1.7.3"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "1g371q9p31i57fkidjp2akvrbaadpyx3bwmg5kn72sc2mbv7p7h9"; + sha256 = "0dzryi9x873p9gikzcb9wzwqv2j3wssm0b85ws63vqjszpckgbbn"; }; patchPhase = '' diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index c4530da54531..6b9aa4587350 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { + optionalString withMesa "${mesa.out}/lib "; # Work around a bug in configure. - NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" ]; + NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ]; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix index 5c45b29ec5cd..ed9372725146 100644 --- a/pkgs/development/libraries/wxGTK-3.0/default.nix +++ b/pkgs/development/libraries/wxGTK-3.0/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto -, gstreamer, gst_plugins_base, GConf, setfile +{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm +, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, setfile , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true , withWebKit ? false, webkitgtk2 ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null @@ -33,6 +33,11 @@ stdenv.mkDerivation { propagatedBuildInputs = optional stdenv.isDarwin AGL; + patches = [ (fetchpatch { + url = "https://raw.githubusercontent.com/jessehager/MINGW-packages/af6ece963d8157dd3fbc710bcc190647c4924c63/mingw-w64-wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch"; + sha256 = "0100pg0z7i6cjyysf2k3330pmqmdaxgc9hz6kxnfvc31dynjcq3h"; + }) ]; + configureFlags = [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" (if compat24 then "--enable-compat24" else "--disable-compat24") |