From b69ac6c15955ef5115360baf6f7ec361a9037d49 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 18 Dec 2014 11:34:57 +0100 Subject: [PATCH] virtualbox: Allow to easily change the build type. Not really changes anything in functionality, but makes it easier to change the build type to "debug", for example. Signed-off-by: aszlig --- .../virtualization/virtualbox/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index d43a60d7564e..7f12d2fa8f8c 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -12,24 +12,25 @@ with stdenv.lib; let + buildType = "release"; version = "4.3.20"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ - out/linux.*/release/bin/src/vboxdrv \ - out/linux.*/release/bin/src/vboxpci \ - out/linux.*/release/bin/src/vboxnetadp \ - out/linux.*/release/bin/src/vboxnetflt + out/linux.*/${buildType}/bin/src/vboxdrv \ + out/linux.*/${buildType}/bin/src/vboxpci \ + out/linux.*/${buildType}/bin/src/vboxnetadp \ + out/linux.*/${buildType}/bin/src/vboxnetflt do if [ "x$(basename "$mod")" != xvboxdrv -a ! -e "$mod/Module.symvers" ] then - cp -v out/linux.*/release/bin/src/vboxdrv/Module.symvers \ + cp -v out/linux.*/${buildType}/bin/src/vboxdrv/Module.symvers \ "$mod/Module.symvers" fi INSTALL_MOD_PATH="$out" INSTALL_MOD_DIR=misc \ make -C "$MODULES_BUILD_DIR" DEPMOD=/do_not_use_depmod \ - "M=\$(PWD)/$mod" ${action} + "M=\$(PWD)/$mod" BUILD_TYPE="${buildType}" ${action} done ''; @@ -129,7 +130,7 @@ in stdenv.mkDerivation { buildPhase = '' source env.sh - kmk + kmk BUILD_TYPE="${buildType}" ${forEachModule "modules"} ''; @@ -139,7 +140,7 @@ in stdenv.mkDerivation { # Install VirtualBox files mkdir -p "$libexec" - find out/linux.*/release/bin -mindepth 1 -maxdepth 1 \ + find out/linux.*/${buildType}/bin -mindepth 1 -maxdepth 1 \ -name src -o -exec cp -avt "$libexec" {} + # Install kernel modules