profanity: Clean up package expression file.

No real changes in functionality, other than renaming libnotifySupport
to just notifySupport.

I've wrapped the lines to a maximum of 80 characters in width, so the
file looks less cluttered up. Which includes setting apart the attribute
for notifySupport and its respective dependencies from the main
dependencies.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

pkgs/applications/networking/instant-messengers/profanity/default.nix

@@ -1,11 +1,15 @@
-{ stdenv, fetchurl, automake, autoconf, pkgconfig, glib, openssl, expat, ncurses, libotr, curl, libstrophe,
-libnotifySupport ? false, libnotify ? null, libXScrnSaver ? null, libX11 ? null, gdk_pixbuf ? null}:
+{ stdenv, fetchurl, automake, autoconf, pkgconfig, glib, openssl, expat
+, ncurses, libotr, curl, libstrophe
 
-assert libnotifySupport -> (libnotify != null && libXScrnSaver != null && libX11 != null && gdk_pixbuf != null);
+, notifySupport ? false, libnotify ? null, libXScrnSaver ? null
+,                        libX11 ? null, gdk_pixbuf ? null
+}:
+
+assert notifySupport -> libnotify != null && libXScrnSaver != null
+                     && libX11 != null && gdk_pixbuf != null;
+
+with stdenv.lib;
 
-let
-  optional = stdenv.lib.optional;
-in
 stdenv.mkDerivation rec {
   name = "profanity-${version}";
   version = "0.4.5";
@@ -15,8 +19,10 @@ stdenv.mkDerivation rec {
     sha256 = "0qzwqxcxf695z3gf94psd2x619vlp4hkkjmkrpsla1ns0f6v6dkl";
   };
 
-  buildInputs = [ automake autoconf pkgconfig glib openssl expat ncurses libotr curl libstrophe ]
-    ++ optional libnotifySupport [ libnotify libXScrnSaver libX11 gdk_pixbuf ];
+  buildInputs = [
+    automake autoconf pkgconfig
+    glib openssl expat ncurses libotr curl libstrophe
+  ] ++ optionals notifySupport [ libnotify libXScrnSaver libX11 gdk_pixbuf ];
 
   preConfigure = "sh bootstrap.sh";
 
@@ -27,8 +33,8 @@ stdenv.mkDerivation rec {
       libstrophe, inspired by Irssi.
     '';
     homepage = http://profanity.im/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.devhell ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.devhell ];
   };
 }

pkgs/top-level/all-packages.nix

@@ -10580,7 +10580,7 @@ let
   procmail = callPackage ../applications/misc/procmail { };
 
   profanity = callPackage ../applications/networking/instant-messengers/profanity {
-    libnotifySupport = config.profanity.libnotifySupport or true;
+    notifySupport = config.profanity.notifySupport or true;
   };
 
   pstree = callPackage ../applications/misc/pstree { };