From 229b99321f45694f6e778681715cc98ec466810f Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 21 Sep 2011 13:13:36 +0000
Subject: [PATCH] Make blcr module use the configured kernel

svn path=/nixos/trunk/; revision=29413
---
 modules/programs/blcr.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/programs/blcr.nix b/modules/programs/blcr.nix
index b6407ee603b..c80f46d642e 100644
--- a/modules/programs/blcr.nix
+++ b/modules/programs/blcr.nix
@@ -2,15 +2,14 @@
 
 let
   inherit (pkgs.lib) mkOption mkIf;
-
   cfg = config.environment.blcr;
-
-  blcrPkg = config.boot.kernelPackages.blcr;
+  kernelPkgs = config.boot.kernelPackages;
+  blcrPkg = kernelPkgs.blcr;
 
   insmod = "${pkgs.module_init_tools}/sbin/insmod";
   rmmod  = "${pkgs.module_init_tools}/sbin/rmmod";
 
-  modulesDir      = "${blcrPkg}/lib/modules/${pkgs.linux.version}";
+  modulesDir      = "${blcrPkg}/lib/modules/${kernelPkgs.kernel.version}";
   blcr_imports_ko = "${modulesDir}/blcr_imports.ko";
   blcr_ko         = "${modulesDir}/blcr.ko";
 in