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

Remove dependencies on `stdenv' components from `xmlto'. 

svn path=/nixpkgs/trunk/; revision=11049
This commit is contained in:
Ludovic Courtès 2008-03-11 09:16:12 +00:00
parent d195542ac3
commit f528309936
2 changed files with 5 additions and 5 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 , docbook_xml_dtd_42, docbook_xsl
, bash, getopt, mktemp, findutils , glibc, bash, getopt, mktemp, findutils
, makeWrapper }: , makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,15 +12,15 @@ stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
substituteInPlace "xmlto.in" \ substituteInPlace "xmlto.in" \
--replace "/bin/bash" "${stdenv.bash}/bin/bash" --replace "/bin/bash" "${bash}/bin/bash"
substituteInPlace "xmlto.in" \ substituteInPlace "xmlto.in" \
--replace "/usr/bin/locale" "${stdenv.glibc}/bin/locale" --replace "/usr/bin/locale" "${glibc}/bin/locale"
''; '';
configureFlags = '' configureFlags = ''
--with-mktemp=${mktemp}/bin/mktemp --with-mktemp=${mktemp}/bin/mktemp
--with-find=${findutils}/bin/find --with-find=${findutils}/bin/find
--with-bash=${stdenv.bash}/bin/bash --with-bash=${bash}/bin/bash
--with-getopt=${getopt}/bin/getopt --with-getopt=${getopt}/bin/getopt
''; '';

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

@ -1055,7 +1055,7 @@ rec {
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 docbook_xml_dtd_42 docbook_xsl
bash getopt mktemp findutils makeWrapper; glibc bash getopt mktemp findutils makeWrapper;
}; };
xmltv = import ../tools/misc/xmltv { xmltv = import ../tools/misc/xmltv {