From d8f9f47e56bcbf590e93c0607febea5edf74163d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 17 May 2013 16:32:03 +0200
Subject: [PATCH] Updating xfe (1.34) and fox (1.6.48)

---
 pkgs/applications/misc/xfe/default.nix     | 10 +++-------
 pkgs/development/libraries/fox/default.nix |  2 +-
 pkgs/development/libraries/fox/fox-1.6.nix | 12 +++++++-----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix
index 72544796695..bd00d91e23d 100644
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/pkgs/applications/misc/xfe/default.nix
@@ -1,15 +1,11 @@
 { stdenv, fetchurl, fox, pkgconfig, gettext, x11, gcc, intltool, file, libpng }:
 
-let
-  version = "1.33";
-in
-
 stdenv.mkDerivation rec {
-  name = "xfe-${version}";
+  name = "xfe-1.34";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/xfe/xfe/${version}/${name}.tar.gz";
-    md5 = "fb089ba73add411b08a6560eeb51742d";
+    url = "mirror://sourceforge/xfe/${name}.tar.gz";
+    sha256 = "0y6gi8vdvw1prz7dv7wadf7v8gl6g75jrlrl5jnsb71l1431ncay";
   };
 
   buildInputs = [ fox pkgconfig gettext x11 gcc intltool file libpng ];
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index bfe7c68dd3e..87e47e1b046 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
         Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
       '';
     homepage = "http://fox-toolkit.org";
-    license = "LGPL";
+    license = "LGPLv3";
     maintainers = [ stdenv.lib.maintainers.bbenoist ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
index c0946d79e3c..540c2c61d94 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -1,7 +1,8 @@
-{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, mesa, libXft }:
+{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor
+, libXrandr, mesa, libXft, libXfixes, xinput }:
 
 let
-  version = "1.6.9";
+  version = "1.6.48";
 in
 
 stdenv.mkDerivation rec {
@@ -9,10 +10,11 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
-    md5 = "8ab8274237431865f57b2f5596374a65";
+    sha256 = "1i0q0357lrd41jjr2nkf2a7ls5ls2nwrkxbfc7202vy22942lb9k";
   };
 
-  buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ];
+  buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr
+      libXft mesa libXfixes xinput ];
 
   doCheck = true;
 
@@ -27,7 +29,7 @@ stdenv.mkDerivation rec {
         Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
       '';
     homepage = "http://fox-toolkit.org";
-    license = "LGPL";
+    license = "LGPLv3";
     maintainers = [ stdenv.lib.maintainers.bbenoist ];
     platforms = stdenv.lib.platforms.all;
   };