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

Building Nix from SVN now needs libxml2

Browse Source 
svn path=/nixpkgs/trunk/; revision=17273
This commit is contained in:
Michael Raskin 2009-09-19 11:40:36 +00:00
parent dc176f6a2b
commit 50c69a093c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/package-management/nix/custom.nix
View File

@ -7,6 +7,7 @@
, bison ? null , bison ? null
, flex ? null , flex ? null
, w3m ? null , w3m ? null
, libxml2 ? null
, docbook5_xsl ? null, libxslt ? null , docbook5_xsl ? null, libxslt ? null
, docbook5 ? null, docbook_xml_dtd_43 ? null , docbook5 ? null, docbook_xml_dtd_43 ? null
, configureFlags ? [] , configureFlags ? []
@ -30,6 +31,7 @@ stdenv.mkDerivation {
++ (if docbook5 != null then [docbook5] else []) ++ (if docbook5 != null then [docbook5] else [])
++ (if docbook_xml_dtd_43 != null then [docbook_xml_dtd_43] else []) ++ (if docbook_xml_dtd_43 != null then [docbook_xml_dtd_43] else [])
++ (if w3m != null then [w3m] else []) ++ (if w3m != null then [w3m] else [])
++ (if libxml2 != null then [libxml2] else [])
; ;
preConfigure = preConfigure =

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

@ -8225,7 +8225,7 @@ let
flex = flex2533; flex = flex2533;
aterm = aterm242fixes; aterm = aterm242fixes;
db4 = db45; db4 = db45;
inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m; inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m libxml2;
}; };
disnix = import ../tools/package-management/disnix { disnix = import ../tools/package-management/disnix {