Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-07-15 14:41:01 +00:00
parent 0761573507 f402c6321a
commit 5185bc1773
1603 changed files with 132258 additions and 39568 deletions
@@ -8,6 +8,12 @@ stdenv.mkDerivation rec {
    sha256 = "1wjf79ipqwb5phfjjwf15rwgigakylnfqaj4crs5qnds6ba6i1ld";
  };

+  patches = [(fetchurl {
+    url = "https://anonscm.debian.org/cgit/pkg-phototools/libgphoto2.git/plain"
+      + "/debian/patches/libjpeg_turbo_1.5.0_fix.patch?id=8ce79a2a02d";
+    sha256 = "114iyhk6idxz2jhnzpf1glqm6d0x0y8cqfpqxz9i96q9j7x3wwin";
+  })];
+
  nativeBuildInputs = [ pkgconfig gettext ];
  buildInputs = [ libtool libjpeg libusb1 ];