Make all-packages.nix instantiatable again (problem was with *Base packages that were only supposed as .meta.function carriers, so some critical arguments were omitted)
svn path=/nixpkgs/trunk/; revision=12628
This commit is contained in:
parent
99c46f200c
commit
65ce0411d8
|
@ -17,13 +17,13 @@ args : with args;
|
|||
]
|
||||
++ (if args ? mysql then [
|
||||
" --with-mysql "
|
||||
" --with-mysql-incdir=${mysql}/include/mysql "
|
||||
" --with-mysql-libdir=${mysql}/lib/mysql "
|
||||
" --with-mysql-incdir=${args.mysql}/include/mysql "
|
||||
" --with-mysql-libdir=${args.mysql}/lib/mysql "
|
||||
] else [])
|
||||
++ (if args ? sqlite then [
|
||||
" --with-sqlite "
|
||||
" --with-sqlite-incdir=${sqlite}/include/sqlite "
|
||||
" --with-sqlite-libdir=${sqlite}/lib/sqlite "
|
||||
" --with-sqlite-incdir=${args.sqlite}/include/sqlite "
|
||||
" --with-sqlite-libdir=${args.sqlite}/lib/sqlite "
|
||||
] else [])
|
||||
;
|
||||
} null; /* null is a terminator for sumArgs */
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
args : with args;
|
||||
assert args ? kernel;
|
||||
rec {
|
||||
src = fetchurl {
|
||||
url = http://ftg.lbl.gov/CheckpointRestart/downloads/blcr-0.6.5.tar.gz ;
|
||||
|
@ -7,9 +8,9 @@ rec {
|
|||
|
||||
buildInputs = [perl];
|
||||
configureFlags = [
|
||||
"--with-linux=$(ls -d ${kernel}/lib/modules/*/build)"
|
||||
"--with-kmod-dir=$out/lib/modules/$(cd ${kernel}/lib/modules; ls -d 2.6.*)"
|
||||
"--with-system-map=${kernel}/System.map"
|
||||
"--with-linux=$(ls -d ${args.kernel}/lib/modules/*/build)"
|
||||
"--with-kmod-dir=$out/lib/modules/$(cd ${args.kernel}/lib/modules; ls -d 2.6.*)"
|
||||
"--with-system-map=${args.kernel}/System.map"
|
||||
];
|
||||
|
||||
preConfigure = FullDepEntry (''
|
||||
|
|
Loading…
Reference in a new issue