* librsync is missing.

* mkDerivationByConfigruation wasn't commented out correctly (no
  nested comments, unfortunately).

svn path=/nixpkgs/trunk/; revision=9287
This commit is contained in:
Eelco Dolstra 2007-09-10 14:29:45 +00:00
parent d6705992aa
commit f45f9a71e1
1 changed files with 3 additions and 1 deletions

View File

@ -193,7 +193,7 @@ rec {
let co = chooseOptionsByFlags { inherit args flagConfig optionals defaults collectExtraPhaseActions; }; in let co = chooseOptionsByFlags { inherit args flagConfig optionals defaults collectExtraPhaseActions; }; in
args.stdenv.mkDerivation ( args.stdenv.mkDerivation (
{ {
inherit (co) configureFlags buildInputs /*flags*/; inherit (co) configureFlags buildInputs /*flags* /;
} // extraAttrs co // co.pass // co.flags_prefixed ); } // extraAttrs co // co.pass // co.flags_prefixed );
*/ */
@ -606,10 +606,12 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
/*
rdiff_backup = import ../tools/backup/rdiff-backup { rdiff_backup = import ../tools/backup/rdiff-backup {
inherit fetchurl stdenv librsync gnused; inherit fetchurl stdenv librsync gnused;
python=python; python=python;
}; };
*/
rpm = import ../tools/package-management/rpm { rpm = import ../tools/package-management/rpm {
inherit fetchurl stdenv cpio zlib bzip2 file sqlite beecrypt neon elfutils; inherit fetchurl stdenv cpio zlib bzip2 file sqlite beecrypt neon elfutils;