aegisub: slight clean up

pkgs/applications/video/aegisub/default.nix

@@ -1,16 +1,42 @@
-{ config, stdenv, fetchurl, fetchpatch
+{ config
-, libX11, wxGTK
+, stdenv
-, libiconv, fontconfig, freetype
+, fetchurl
-, libGLU, libGL
+, fetchpatch
-, libass, fftw, ffms
+, libX11
-, ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
+, wxGTK
-, icu, boost, intltool # New dependencies
+, libiconv
-, spellcheckSupport ? true, hunspell ? null
+, fontconfig
-, automationSupport ? true, lua ? null
+, freetype
-, openalSupport ? false, openal ? null
+, libGLU
-, alsaSupport ? stdenv.isLinux, alsaLib ? null
+, libGL
-, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
+, libass
-, portaudioSupport ? false, portaudio ? null }:
+, fftw
+, ffms
+, ffmpeg
+, pkg-config
+, zlib
+, icu
+, boost
+, intltool
+
+, spellcheckSupport ? true
+, hunspell ? null
+
+, automationSupport ? true
+, lua ? null
+
+, openalSupport ? false
+, openal ? null
+
+, alsaSupport ? stdenv.isLinux
+, alsaLib ? null
+
+, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux
+, libpulseaudio ? null
+
+, portaudioSupport ? false
+, portaudio ? null
+}:
 
 assert spellcheckSupport -> (hunspell != null);
 assert automationSupport -> (lua != null);
@@ -20,7 +46,8 @@ assert pulseaudioSupport -> (libpulseaudio != null);
 assert portaudioSupport -> (portaudio != null);
 
 with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation
+ rec {
   pname = "aegisub";
   version = "3.2.2";
 
@@ -43,9 +70,26 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  buildInputs = with stdenv.lib;
+  nativeBuildInputs = [
-  [ pkgconfig intltool libX11 wxGTK fontconfig freetype libGLU libGL
+    pkg-config
-    libass fftw ffms ffmpeg zlib icu boost boost.out libiconv
+    intltool
+  ];
+
+  buildInputs = with stdenv.lib; [
+    libX11
+    wxGTK
+    fontconfig
+    freetype
+    libGLU
+    libGL
+    libass
+    fftw
+    ffms
+    ffmpeg
+    zlib
+    icu
+    boost
+    libiconv
   ]
     ++ optional spellcheckSupport hunspell
     ++ optional automationSupport lua
@@ -78,11 +122,11 @@ stdenv.mkDerivation rec {
       audio, and features many powerful tools for styling them, including a
       built-in real-time video preview.
     '';
-    homepage = http://www.aegisub.org/;
+    homepage = "http://www.aegisub.org/";
+    # The Aegisub sources are itself BSD/ISC,
+    # but they are linked against GPL'd softwares
+    # - so the resulting program will be GPL
     license = licenses.bsd3;
-              # The Aegisub sources are itself BSD/ISC,
-              # but they are linked against GPL'd softwares
-              # - so the resulting program will be GPL
     maintainers = [ maintainers.AndersonTorres ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };