From 65ce0411d828fee057dad01f76f3eda7cc43b846 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 14 Aug 2008 22:18:44 +0000
Subject: [PATCH] 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
---
 pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix | 8 ++++----
 pkgs/os-specific/linux/blcr/0.6.5.nix                 | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
index f218fa51c809..ec386a92e534 100644
--- a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
+++ b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
@@ -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 */
diff --git a/pkgs/os-specific/linux/blcr/0.6.5.nix b/pkgs/os-specific/linux/blcr/0.6.5.nix
index 22be20b28c87..c16be4f9c700 100644
--- a/pkgs/os-specific/linux/blcr/0.6.5.nix
+++ b/pkgs/os-specific/linux/blcr/0.6.5.nix
@@ -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 (''