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

Now SVN Nix builds as a purely alternative Nix choice

Browse Source 
svn path=/nixpkgs/trunk/; revision=9666
This commit is contained in:
Michael Raskin 2007-11-14 01:20:17 +00:00
parent 29e0bc3103
commit 076cc3a7d8
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,15 @@
{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null { stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null
, storeDir ? "/nix/store" , storeDir ? "/nix/store"
, stateDir ? "/nix/var" , 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 { stdenv.mkDerivation {
@ -9,12 +17,25 @@ stdenv.mkDerivation {
inherit src; 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-store-dir=${storeDir} --localstatedir=${stateDir}
--with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2} --with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2}
--disable-init-state"; --disable-init-state"] ++ configureFlags ;
meta = { meta = {
description = "The Nix Deployment System"; description = "The Nix Deployment System";

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

@ -4524,10 +4524,16 @@ rec {
db4 = db45; db4 = db45;
}; };
nixCustomFun = src: (import ../tools/package-management/nix/custom.nix { nixCustomFun = src: preConfigure: configureFlags :
inherit fetchurl stdenv perl curl bzip2 openssl src; (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; aterm = aterm242fixes;
db4 = db45; db4 = db45;
inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;
}); });
ntfs3g = import ../misc/ntfs-3g { ntfs3g = import ../misc/ntfs-3g {