guile-gnome: code style formatting nitpicks

1 files changed, 18 insertions, 35 deletions

diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix
index 45fdafa9852..4711eaeaad9 100644
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/pkgs/development/guile-modules/guile-gnome/default.nix
@@ -1,58 +1,41 @@
 { fetchurl, stdenv, guile, guile-lib, gwrap
 , pkgconfig, gconf, glib, gnome_vfs, gtk2
 , libglade, libgnome, libgnomecanvas, libgnomeui
-, pango, guile-cairo, autoconf, automake, texinfo }:
+, pango, guile-cairo, autoconf, automake, texinfo
+}:
 
 stdenv.mkDerivation rec {
-  name = "guile-gnome-platform-2.16.4";
+  name = "${pname}-${version}";
+  pname = "guile-gnome-platform";
+  version = "2.16.4";
 
   src = fetchurl {
-    url = "http://ftp.gnu.org/pub/gnu/guile-gnome/guile-gnome-platform/${name}.tar.gz";
+    url = "http://ftp.gnu.org/pub/gnu/guile-gnome/${pname}/${name}.tar.gz";
     sha256 = "adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3";
   };
 
   buildInputs = [
-    autoconf
-    automake
-    texinfo
-    guile
-    gwrap
-    pkgconfig
-    gconf
-    glib
-    gnome_vfs
-    gtk2
-    libglade
-    libgnome
-    libgnomecanvas
-    libgnomeui
-    pango
-    guile-cairo
+    autoconf automake texinfo guile gwrap pkgconfig gconf glib gnome_vfs gtk2
+    libglade libgnome libgnomecanvas libgnomeui pango guile-cairo
   ] ++ stdenv.lib.optional doCheck guile-lib;
 
-  preConfigure = ''
-      ./autogen.sh
-  '';
+  preConfigure = "./autogen.sh";
 
   # The test suite tries to open an X display, which fails.
   doCheck = false;
 
   meta = with stdenv.lib; {
     description = "GNOME bindings for GNU Guile";
-
-    longDescription =
-      '' GNU guile-gnome brings the power of Scheme to your graphical
-         application.  guile-gnome modules support the entire Gnome library
-         stack: from Pango to GnomeCanvas, Gtk+ to GStreamer, Glade to
-         GtkSourceView, you will find in guile-gnome a comprehensive
-         environment for developing modern applications.
-      '';
-
-    homepage = http://www.gnu.org/software/guile-gnome/;
-
+    longDescription = ''
+      GNU guile-gnome brings the power of Scheme to your graphical application.
+      guile-gnome modules support the entire Gnome library stack: from Pango to
+      GnomeCanvas, Gtk+ to GStreamer, Glade to GtkSourceView, you will find in
+      guile-gnome a comprehensive environment for developing modern
+      applications.
+    '';
+    homepage = "http://www.gnu.org/software/guile-gnome/";
     license = licenses.gpl2Plus;
-
     maintainers = with maintainers; [ vyp ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }