* More cleanup.

svn path=/nixpkgs/trunk/; revision=22795

pkgs/tools/graphics/gifscile/default.nix

@@ -1,17 +0,0 @@
-args:
-args.stdenv.mkDerivation {
-  name = "gifsicle-1.52";
-
-  src = args.fetchurl {
-    url = http://www.lcdf.org/gifsicle/gifsicle-1.52.tar.gz;
-    sha256 = "1fp47grvk46bkj22zixrhgpgs3qbkmijicf3wkjk4y8fsx0idbgk";
-  };
-
-  buildInputs =(with args; [xproto libXt libX11]);
-
-  meta = { 
-      description = "command-line tool for creating, editing, and getting information about GIF images and animations";
-      homepage = http://www.lcdf.org/gifsicle/;
-      license = "GPL2";
-  };
-}

pkgs/tools/graphics/gifsicle/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, xproto, libXt, libX11 }:
+
+stdenv.mkDerivation {
+  name = "gifsicle-1.52";
+
+  src = fetchurl {
+    url = http://www.lcdf.org/gifsicle/gifsicle-1.52.tar.gz;
+    sha256 = "1fp47grvk46bkj22zixrhgpgs3qbkmijicf3wkjk4y8fsx0idbgk";
+  };
+
+  buildInputs = [ xproto libXt libX11 ];
+
+  meta = { 
+    description = "Command-line tool for creating, editing, and getting information about GIF images and animations";
+    homepage = http://www.lcdf.org/gifsicle/;
+    license = "GPL2";
+  };
+}

pkgs/tools/graphics/gnuplot/default.nix

@@ -15,15 +15,16 @@
 
 stdenv.mkDerivation {
   name = "gnuplot-4.4.0";
+  
   src = fetchurl {
     url = "mirror://sourceforge/gnuplot/gnuplot-4.4.0.tar.gz";
     sha256 = "0akb2lzxa3b0j4nr6anr0mhsk10b1fcnixk8vk9aa82rl1a2rph0";
   };
 
-  configureFlags = if (libX11 != null) then ["--with-x"] else ["--without-x"];
+  configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"];
 
-  buildInputs = [
-    zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw
-    wxGTK pango cairo pkgconfig
-  ];
+  buildInputs =
+    [ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw
+      wxGTK pango cairo pkgconfig
+    ];
 }