vips: clean up

pkgs/tools/graphics/vips/default.nix

@@ -1,11 +1,25 @@
-{ 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
+, autoreconfHook
+, gtk-doc
+, gobject-introspection
+,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,11 +38,29 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobject-introspection ];
+  nativeBuildInputs = [
-  buildInputs = [ glib libxml2 fftw orc lcms
+    pkgconfig
-    imagemagick openexr libtiff libjpeg
+    autoreconfHook
-    libgsf libexif python27 libpng expat ]
+    gtk-doc
-    ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    glib
+    libxml2
+    fftw
+    orc
+    lcms
+    imagemagick
+    openexr
+    libtiff
+    libjpeg
+    libgsf
+    libexif
+    python27
+    libpng
+    expat
+  ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
 
   autoreconfPhase = ''
     ./autogen.sh