Merge branch 'master' into hardened-stdenv

2016-08-13 16:59:55 +02:00
parent fa3a35b241 79149ac12d
commit bd4490e277
106 changed files with 3736 additions and 2595 deletions
--- a/pkgs/development/libraries/gegl/3.0.nix
+++ b/pkgs/development/libraries/gegl/3.0.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
-, librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook }:
+, librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook, libraw }:

 stdenv.mkDerivation rec {
  name = "gegl-0.3.6";
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    babl libpng cairo libjpeg librsvg pango gtk bzip2 which json_glib intltool
+    libraw
  ];

  nativeBuildInputs = [ pkgconfig autoreconfHook ];