mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-24 06:08:16 +03:00
* Include the kernel version number in the Virtualbox name attribute
to disambiguate between the various Virtualbox builds. svn path=/nixpkgs/trunk/; revision=15087
This commit is contained in:
parent
32c7cb7a1d
commit
fb6ccb6355
@ -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 {
|
stdenv.mkDerivation {
|
||||||
name = "virtualbox-2.2.0";
|
name = "virtualbox-2.2.0-${kernel.version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://download.virtualbox.org/virtualbox/2.2.0/VirtualBox-2.2.0-OSE.tar.bz2;
|
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
|
ensureDir $MODULE_DIR
|
||||||
make install
|
make install
|
||||||
ensureDir $out/bin
|
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|" \
|
sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \
|
||||||
-e "s|@QT4_PATH@|${qt4}/lib|" \
|
-e "s|@QT4_PATH@|${qt4}/lib|" \
|
||||||
-e "s|which|${which}/bin/which|" \
|
-e "s|which|${which}/bin/which|" \
|
||||||
|
Loading…
Reference in New Issue
Block a user