From 67b32b0ec71a4a773e35ba1c2ea0b30fcb1fe010 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Apr 2009 14:10:15 +0000
Subject: [PATCH] * system-config-printer: don't apply autoconf/automake,
 because then   we need to have exactly the right versions of those :-)

svn path=/nixpkgs/branches/stdenv-updates/; revision=15183
---
 pkgs/tools/misc/system-config-printer/default.nix | 9 ++++-----
 pkgs/top-level/all-packages.nix                   | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 05531482c79..54f9bc57f0c 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, perlXMLParser, autoconf, automake, intltool, gettext, desktop_file_utils}:
+{stdenv, fetchurl, perl, perlXMLParser, desktop_file_utils}:
 
 stdenv.mkDerivation {
   name = "system-config-printer-0.9.93";
@@ -6,11 +6,10 @@ stdenv.mkDerivation {
     url = http://cyberelk.net/tim/data/system-config-printer/system-config-printer-0.9.93.tar.bz2;
     md5 = "b97deae648bc1c5825874d250a9c140c";
   };
-  patchPhase = ''
-    sed -i -e "s/xmlto/echo xmlto/" Makefile.am # Disable building manual pages
+  preConfigure = ''
+    sed -i -e "s/xmlto/echo xmlto/" Makefile.in # Disable building manual pages
     echo > man/system-config-printer.1
     echo > man/system-config-printer-applet.1
-    ./bootstrap
   ''; 
-  buildInputs = [ perl perlXMLParser autoconf automake intltool gettext desktop_file_utils ];
+  buildInputs = [ perl perlXMLParser desktop_file_utils ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f563302009..82aeca97f3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1310,7 +1310,7 @@ let
   };
 
   system_config_printer = import ../tools/misc/system-config-printer {
-    inherit stdenv fetchurl perl perlXMLParser autoconf automake intltool gettext desktop_file_utils;
+    inherit stdenv fetchurl perl perlXMLParser desktop_file_utils;
   };
 
   tcpdump = import ../tools/networking/tcpdump {