diff options
| author | Marco Maggesi <maggesi@math.unifi.it> | 2011-09-21 13:13:36 +0000 |
|---|---|---|
| committer | Marco Maggesi <maggesi@math.unifi.it> | 2011-09-21 13:13:36 +0000 |
| commit | 229b99321f45694f6e778681715cc98ec466810f (patch) | |
| tree | 1baa00ed1679859f77bbd79f3ab7047e8d49960d /modules/programs | |
| parent | 7d982fd1bd009f18189c267fc1d429e9c6bcc2fd (diff) | |
| download | nixpkgs-229b99321f45694f6e778681715cc98ec466810f.tar nixpkgs-229b99321f45694f6e778681715cc98ec466810f.tar.gz nixpkgs-229b99321f45694f6e778681715cc98ec466810f.tar.bz2 nixpkgs-229b99321f45694f6e778681715cc98ec466810f.tar.lz nixpkgs-229b99321f45694f6e778681715cc98ec466810f.tar.xz nixpkgs-229b99321f45694f6e778681715cc98ec466810f.tar.zst nixpkgs-229b99321f45694f6e778681715cc98ec466810f.zip | |
Make blcr module use the configured kernel
svn path=/nixos/trunk/; revision=29413
Diffstat (limited to 'modules/programs')
| -rw-r--r-- | modules/programs/blcr.nix | 7 |
1 files 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 |