From fb6ccb6355fa910e3a910597c5102889bcf19bad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 16 Apr 2009 13:44:06 +0000 Subject: [PATCH] * Include the kernel version number in the Virtualbox name attribute to disambiguate between the various Virtualbox builds. svn path=/nixpkgs/trunk/; revision=15087 --- .../virtualization/virtualbox/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index c2a75c1c1739..fa1a0563339d 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,9 +1,10 @@ -{stdenv, fetchurl, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext, libXcursor, qt3, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel, python, which}: +{ stdenv, fetchurl, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext +, libXcursor, qt3, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel +, python, which +}: -let vboxScript = ./VBox.sh; -in stdenv.mkDerivation { - name = "virtualbox-2.2.0"; + name = "virtualbox-2.2.0-${kernel.version}"; src = fetchurl { url = http://download.virtualbox.org/virtualbox/2.2.0/VirtualBox-2.2.0-OSE.tar.bz2; @@ -56,7 +57,7 @@ stdenv.mkDerivation { ensureDir $MODULE_DIR make install ensureDir $out/bin - cp -v ${vboxScript} $out/bin/VBox.sh + cp -v ${./VBox.sh} $out/bin/VBox.sh sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \ -e "s|@QT4_PATH@|${qt4}/lib|" \ -e "s|which|${which}/bin/which|" \