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

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)

Browse Source 
svn path=/nixpkgs/trunk/; revision=12628
This commit is contained in:
Michael Raskin 2008-08-14 22:18:44 +00:00
parent 99c46f200c
commit 65ce0411d8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
View File

@ -17,13 +17,13 @@ args : with args;
] ]
++ (if args ? mysql then [ ++ (if args ? mysql then [
" --with-mysql " " --with-mysql "
" --with-mysql-incdir=${mysql}/include/mysql " " --with-mysql-incdir=${args.mysql}/include/mysql "
" --with-mysql-libdir=${mysql}/lib/mysql " " --with-mysql-libdir=${args.mysql}/lib/mysql "
] else []) ] else [])
++ (if args ? sqlite then [ ++ (if args ? sqlite then [
" --with-sqlite " " --with-sqlite "
" --with-sqlite-incdir=${sqlite}/include/sqlite " " --with-sqlite-incdir=${args.sqlite}/include/sqlite "
" --with-sqlite-libdir=${sqlite}/lib/sqlite " " --with-sqlite-libdir=${args.sqlite}/lib/sqlite "
] else []) ] else [])
; ;
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */

7
pkgs/os-specific/linux/blcr/0.6.5.nix
View File

@ -1,4 +1,5 @@
args : with args; args : with args;
assert args ? kernel;
rec { rec {
src = fetchurl { src = fetchurl {
url = http://ftg.lbl.gov/CheckpointRestart/downloads/blcr-0.6.5.tar.gz ; url = http://ftg.lbl.gov/CheckpointRestart/downloads/blcr-0.6.5.tar.gz ;
@ -7,9 +8,9 @@ rec {
buildInputs = [perl]; buildInputs = [perl];
configureFlags = [ configureFlags = [
"--with-linux=$(ls -d ${kernel}/lib/modules/*/build)" "--with-linux=$(ls -d ${args.kernel}/lib/modules/*/build)"
"--with-kmod-dir=$out/lib/modules/$(cd ${kernel}/lib/modules; ls -d 2.6.*)" "--with-kmod-dir=$out/lib/modules/$(cd ${args.kernel}/lib/modules; ls -d 2.6.*)"
"--with-system-map=${kernel}/System.map" "--with-system-map=${args.kernel}/System.map"
]; ];
preConfigure = FullDepEntry ('' preConfigure = FullDepEntry (''