public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* 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
This commit is contained in:
Eelco Dolstra 2009-04-20 14:10:15 +00:00
parent 63e318390d
commit 67b32b0ec7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/misc/system-config-printer/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, perl, perlXMLParser, autoconf, automake, intltool, gettext, desktop_file_utils}: {stdenv, fetchurl, perl, perlXMLParser, desktop_file_utils}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "system-config-printer-0.9.93"; 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; url = http://cyberelk.net/tim/data/system-config-printer/system-config-printer-0.9.93.tar.bz2;
md5 = "b97deae648bc1c5825874d250a9c140c"; md5 = "b97deae648bc1c5825874d250a9c140c";
}; };
patchPhase = '' preConfigure = ''
sed -i -e "s/xmlto/echo xmlto/" Makefile.am # Disable building manual pages sed -i -e "s/xmlto/echo xmlto/" Makefile.in # Disable building manual pages
echo > man/system-config-printer.1 echo > man/system-config-printer.1
echo > man/system-config-printer-applet.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 ];
} }

2
pkgs/top-level/all-packages.nix
View File

@ -1310,7 +1310,7 @@ let
}; };
system_config_printer = import ../tools/misc/system-config-printer { 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 { tcpdump = import ../tools/networking/tcpdump {