Now SVN Nix builds as a purely alternative Nix choice
svn path=/nixpkgs/trunk/; revision=9666
This commit is contained in:
parent
29e0bc3103
commit
076cc3a7d8
@ -1,7 +1,15 @@
|
||||
{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null
|
||||
, storeDir ? "/nix/store"
|
||||
, stateDir ? "/nix/var"
|
||||
,src
|
||||
, src
|
||||
, preConfigure ? ""
|
||||
, autoconf ? null, automake ? null, libtool ? null
|
||||
, bison ? null
|
||||
, flex ? null
|
||||
, w3m ? null
|
||||
, docbook5_xsl ? null, libxslt ? null
|
||||
, docbook5 ? null, docbook_xml_dtd_43 ? null
|
||||
, configureFlags ? []
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -9,12 +17,25 @@ stdenv.mkDerivation {
|
||||
|
||||
inherit src;
|
||||
|
||||
buildInputs = [perl curl openssl];
|
||||
buildInputs = [perl curl openssl]
|
||||
++ (if automake != null then [automake] else [])
|
||||
++ (if autoconf != null then [autoconf] else [])
|
||||
++ (if libtool != null then [libtool] else [])
|
||||
++ (if bison != null then [bison] else [])
|
||||
++ (if flex != null then [flex] else [])
|
||||
++ (if docbook5_xsl != null then [docbook5_xsl] else [])
|
||||
++ (if libxslt != null then [libxslt] else [])
|
||||
++ (if docbook5 != null then [docbook5] else [])
|
||||
++ (if docbook_xml_dtd_43 != null then [docbook_xml_dtd_43] else [])
|
||||
++ (if w3m != null then [w3m] else [])
|
||||
;
|
||||
|
||||
configureFlags = "
|
||||
inherit preConfigure;
|
||||
|
||||
configureFlags = ["
|
||||
--with-store-dir=${storeDir} --localstatedir=${stateDir}
|
||||
--with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2}
|
||||
--disable-init-state";
|
||||
--disable-init-state"] ++ configureFlags ;
|
||||
|
||||
meta = {
|
||||
description = "The Nix Deployment System";
|
||||
|
@ -4524,10 +4524,16 @@ rec {
|
||||
db4 = db45;
|
||||
};
|
||||
|
||||
nixCustomFun = src: (import ../tools/package-management/nix/custom.nix {
|
||||
inherit fetchurl stdenv perl curl bzip2 openssl src;
|
||||
nixCustomFun = src: preConfigure: configureFlags :
|
||||
(import ../tools/package-management/nix/custom.nix {
|
||||
inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
|
||||
autoconf libtool configureFlags;
|
||||
bison = bison23;
|
||||
flex = flex2533;
|
||||
aterm = aterm242fixes;
|
||||
db4 = db45;
|
||||
inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;
|
||||
|
||||
});
|
||||
|
||||
ntfs3g = import ../misc/ntfs-3g {
|
||||
|
Loading…
x
Reference in New Issue
Block a user