From d725008855f97ca5232c375ba95aacc5c03f05e0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 22:48:10 +0000
Subject: [PATCH] * IceWM updated to 1.2.37.

svn path=/nixpkgs/trunk/; revision=19244
---
 .../window-managers/icewm/default.nix             | 15 +++++++++------
 pkgs/top-level/all-packages.nix                   |  3 +--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 7a8d12dee505..5394b7f507b2 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -1,13 +1,16 @@
-args: with args;
+{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, imlib, xlibs }:
 
-stdenv.mkDerivation {
-  name = "icewm-1.2.32";
+stdenv.mkDerivation rec {
+  name = "icewm-1.2.37";
 
-  buildInputs = [ gettext libX11 libXft libXext libXinerama libXrandr libjpeg libtiff libungif libpng imlib ];
+  buildInputs =
+    [ gettext libjpeg libtiff libungif libpng imlib
+      xlibs.libX11 xlibs.libXft xlibs.libXext xlibs.libXinerama xlibs.libXrandr
+    ];
 
   src = fetchurl {
-    url = http://mesh.dl.sourceforge.net/sourceforge/icewm/icewm-1.2.32.tar.gz;
-    sha256 = "c2fe6ef0bdc0a9f841ae6fe214c06a15d666f90df027d105305f3e0dc109a667";
+    url = "mirror://sourceforge/icewm/${name}.tar.gz";
+    sha256 = "15852k96z2w19v3d02jynxyf6ld378hbkd6lpy64byysrmjh3dmz";
   };
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27f6a59a624d..a954bfad17c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6966,8 +6966,7 @@ let
   icecatWrapper = wrapFirefox icecat3Xul "icecat" "";
 
   icewm = import ../applications/window-managers/icewm {
-    inherit fetchurl stdenv gettext libjpeg libtiff libungif libpng imlib;
-    inherit (xlibs) libX11 libXft libXext libXinerama libXrandr;
+    inherit fetchurl stdenv gettext libjpeg libtiff libungif libpng imlib xlibs;
   };
 
   ikiwiki = makeOverridable (import ../applications/misc/ikiwiki) {