From 65f45ef322bc2897c303e78c33964e5b74808fa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 7 Mar 2012 21:59:48 +0000
Subject: [PATCH] Updating xsane, and making it build with the old libpng. The
 previous url is gone.

svn path=/nixpkgs/trunk/; revision=32862
---
 pkgs/misc/xsane/default.nix     | 6 +++---
 pkgs/top-level/all-packages.nix | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/xsane/default.nix b/pkgs/misc/xsane/default.nix
index 8a7243a6ab5..6f7227d9dcb 100644
--- a/pkgs/misc/xsane/default.nix
+++ b/pkgs/misc/xsane/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, saneBackends, saneFrontends,
 	libX11, gtk, pkgconfig, libpng, libusb ? null}:
 stdenv.mkDerivation {
-  name = "xsane-0.996";
+  name = "xsane-0.998";
 
   src = fetchurl {
-    url = ftp://ftp.sane-project.org/pub/sane/xsane/xsane-0.996.tar.gz;
-    sha256 = "0zddar0y76iv4c55qzfmnm819z5hzisr2jwjb60x36v6bdrhcjx5";
+    url = http://www.xsane.org/download/xsane-0.998.tar.gz;
+    sha256 = "0vn2cj85ijgp2v2j2h9xpqmg2jwlbxmwyb88kxhjjakqay02ybm3";
   };
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59ddb6335d7..d6f33a39bb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8581,7 +8581,9 @@ let
 
   xosd = callPackage ../misc/xosd { };
 
-  xsane = callPackage ../misc/xsane { };
+  xsane = callPackage ../misc/xsane {
+    libpng = libpng12;
+  };
 
   yafc = callPackage ../applications/networking/yafc { };