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

xmlto: Remove explicit dependency on Glibc.

Browse Source 
svn path=/nixpkgs/trunk/; revision=17261
This commit is contained in:
Ludovic Courtès 2009-09-18 18:22:42 +00:00
parent 1885909e93
commit ee720ec763
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/typesetting/xmlto/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, flex, libxml2, libxslt { fetchurl, stdenv, flex, libxml2, libxslt
, docbook_xml_dtd_42, docbook_xsl, w3m , docbook_xml_dtd_42, docbook_xsl, w3m
, glibc, bash, getopt, mktemp, findutils , bash, getopt, mktemp, findutils
, makeWrapper }: , makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
substituteInPlace "xmlto.in" \ substituteInPlace "xmlto.in" \
--replace "/bin/bash" "${bash}/bin/bash" --replace "/bin/bash" "${bash}/bin/bash"
substituteInPlace "xmlto.in" \ substituteInPlace "xmlto.in" \
--replace "/usr/bin/locale" "${glibc}/bin/locale" --replace "/usr/bin/locale" "$(type -P locale)"
''; '';
configureFlags = '' configureFlags = ''
@ -48,5 +48,7 @@ stdenv.mkDerivation rec {
license = "GPLv2+"; license = "GPLv2+";
homepage = http://cyberelk.net/tim/software/xmlto/; homepage = http://cyberelk.net/tim/software/xmlto/;
maintainers = [ stdenv.lib.maintainers.ludo ];
}; };
} }

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

@ -1607,7 +1607,7 @@ let
xmlto = import ../tools/typesetting/xmlto { xmlto = import ../tools/typesetting/xmlto {
inherit fetchurl stdenv flex libxml2 libxslt inherit fetchurl stdenv flex libxml2 libxslt
docbook_xml_dtd_42 docbook_xsl w3m docbook_xml_dtd_42 docbook_xsl w3m
glibc bash getopt mktemp findutils makeWrapper; bash getopt mktemp findutils makeWrapper;
}; };
xmltv = import ../tools/misc/xmltv { xmltv = import ../tools/misc/xmltv {