Merge pull request #81664 from jtojnar/vips-cleanup

vips: general clean-ups

pkgs/development/node-packages/default-v10.nix

@@ -115,12 +115,9 @@ nodePackages // {
   joplin = nodePackages.joplin.override {
     nativeBuildInputs = [ pkgs.pkg-config ];
     buildInputs = with pkgs; [
-      # sharp, dep list:
+      # required by sharp
-      # http://sharp.pixelplumbing.com/en/stable/install/
+      # https://sharp.pixelplumbing.com/install
-      cairo expat fontconfig freetype fribidi gettext giflib
+      vips
-      glib harfbuzz lcms libcroco libexif libffi libgsf
-      libjpeg_turbo libpng librsvg libtiff vips
-      libwebp libxml2 pango pixman zlib
 
       nodePackages.node-pre-gyp
     ];

pkgs/development/ruby-modules/gem-config/default.nix

@@ -506,7 +506,7 @@ in
         --replace "gobject-2.0" "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}"
 
       substituteInPlace lib/vips.rb \
-        --replace "vips_libname = 'vips'" "vips_libname = '${vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'"
+        --replace "vips_libname = 'vips'" "vips_libname = '${stdenv.lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'"
     '';
   };
 

pkgs/tools/graphics/vips/default.nix

@@ -1,17 +1,34 @@
-{ stdenv, pkgconfig, glib, libxml2, expat,
+{ stdenv
-  fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif,
+, pkgconfig
-  ApplicationServices,
+, glib
-  python27, libpng ? null,
+, libxml2
-  fetchFromGitHub,
+, expat
-  autoreconfHook,
+, fftw
-  gtk-doc,
+, orc
-  gobject-introspection,
+, lcms
+, imagemagick
+, openexr
+, libtiff
+, libjpeg
+, libgsf
+, libexif
+, ApplicationServices
+, python27
+, libpng ? null
+, fetchFromGitHub
+, fetchpatch
+, autoreconfHook
+, gtk-doc
+, gobject-introspection
+,
 }:
 
 stdenv.mkDerivation rec {
   pname = "vips";
   version = "8.9.1";
 
+  outputs = [ "bin" "out" "man" "dev" ];
+
   src = fetchFromGitHub {
     owner = "libvips";
     repo = "libvips";
@@ -24,14 +41,46 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobject-introspection ];
+  patches = [
-  buildInputs = [ glib libxml2 fftw orc lcms
+    # autogen.sh should not run configure
-    imagemagick openexr libtiff libjpeg
+    # https://github.com/libvips/libvips/pull/1566
-    libgsf libexif python27 libpng expat ]
+    (fetchpatch {
-    ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
+      url = "https://github.com/libvips/libvips/commit/97a92e0e6abab652fdf99313b138bfd77d70deb4.patch";
+      sha256 = "0w1sm5wmvfp8svdpk8mz57c1n6zzy3snq0g2f8yxjamv0d2gw2dp";
+    })
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+    autoreconfHook
+    gtk-doc
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    glib
+    libxml2
+    fftw
+    orc
+    lcms
+    imagemagick
+    openexr
+    libtiff
+    libjpeg
+    libgsf
+    libexif
+    python27
+    libpng
+    expat
+  ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
+
+  # Required by .pc file
+  propagatedBuildInputs = [
+    glib
+  ];
 
   autoreconfPhase = ''
-    ./autogen.sh
+    NOCONFIGURE=1 ./autogen.sh
   '';
 
   meta = with stdenv.lib; {