Permalink
Browse files

virtualbox: Use kernel.dev instead of kernelDev

Signed-off-by: Shea Levy <shea@shealevy.com>
  • Loading branch information...
1 parent 88c32c9 commit e9d6a3ff3e89a252a00e9bc4493eb856fa68c7a3 @shlevy committed Mar 25, 2013
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
-, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernelDev, lvm2
+, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2
, which, alsaLib, curl, gawk
, xorriso, makeself, perl, pkgconfig
, javaBindings ? false, jdk ? null
@@ -40,7 +40,7 @@ let
};
in stdenv.mkDerivation {
- name = "virtualbox-${version}-${kernelDev.version}";
+ name = "virtualbox-${version}-${kernel.version}";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
@@ -49,7 +49,7 @@ in stdenv.mkDerivation {
buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
- libcap glib kernelDev lvm2 python alsaLib curl pam xorriso makeself perl
+ libcap glib lvm2 python alsaLib curl pam xorriso makeself perl
pkgconfig which libXmu ]
++ optional javaBindings jdk
++ optional pythonBindings python;
@@ -59,9 +59,10 @@ in stdenv.mkDerivation {
./build_fix_3.9.0.patch
];
+ MODULES_BUILD_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
+
prePatch = ''
set -x
- MODULES_BUILD_DIR=`echo ${kernelDev}/lib/modules/*/build`
sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \
-e 's@MKISOFS --version@MKISOFS -version@' \
-e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \

0 comments on commit e9d6a3f

Please sign in to comment.