public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Upgraded VirtualBox to 3.0.8

Browse Source 
- Fixed location of the VirtualBox icon
- Removed qt3 as dependency of VirtualBox since it's obsolete since 3.0.x


svn path=/nixpkgs/trunk/; revision=17725
This commit is contained in:
Sander van der Burg 2009-10-08 12:57:05 +00:00
parent c4d7f1dc82
commit 0f20924465
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, lib, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext { stdenv, fetchurl, lib, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext
, libXcursor, qt3, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel , libXcursor, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
, python, which, alsaLib, curl , python, which, alsaLib, curl
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "virtualbox-3.0.6-${kernel.version}"; name = "virtualbox-3.0.8-${kernel.version}";
src = fetchurl { src = fetchurl {
url = http://download.virtualbox.org/virtualbox/3.0.6/VirtualBox-3.0.6-OSE.tar.bz2; url = http://download.virtualbox.org/virtualbox/3.0.8/VirtualBox-3.0.8-OSE.tar.bz2;
sha256 = "1vrirm9m8728m77f46l23prshcwjn3ncqgazxkspd01i5cf9cljz"; sha256 = "1qcbl7sf9svs4997rb48yqh3ccj97xz6pnsn5xs3rg3wqxpdywk4";
}; };
buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt3 qt4 libIDL SDL hal libcap glib kernel python alsaLib curl]; buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl];
patchPhase = " patchPhase = "
set -x set -x
@ -25,9 +25,7 @@ stdenv.mkDerivation {
"; ";
configurePhase = '' configurePhase = ''
# It wants the qt utils from qt3, and it takes them from QTDIR ./configure --with-qt4-dir=${qt4} --disable-python --disable-pulse --disable-hardening
export QTDIR=${qt3}
./configure --with-qt-dir=${qt3} --with-qt4-dir=${qt4} --disable-python --disable-pulse --disable-hardening
sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
-i AutoConfig.kmk -i AutoConfig.kmk
sed -e 's@arch/x86/@@' \ sed -e 's@arch/x86/@@' \
@ -48,14 +46,19 @@ stdenv.mkDerivation {
''; '';
installPhase = '' installPhase = ''
# Install VirtualBox files
cd out/linux.*/release/bin cd out/linux.*/release/bin
ensureDir $out/virtualbox ensureDir $out/virtualbox
cp -av * $out/virtualbox cp -av * $out/virtualbox
# Install kernel module
cd src cd src
kernelVersion=$(cd ${kernel}/lib/modules; ls) kernelVersion=$(cd ${kernel}/lib/modules; ls)
export MODULE_DIR=$out/lib/modules/$kernelVersion/misc export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
ensureDir $MODULE_DIR ensureDir $MODULE_DIR
make install make install
# Create wrapper script
ensureDir $out/bin ensureDir $out/bin
cp -v ${./VBox.sh} $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|" \
@ -68,7 +71,10 @@ stdenv.mkDerivation {
do do
[ -f "$out/virtualbox/$file" ] && ln -sfv $out/bin/VBox.sh $out/bin/$file [ -f "$out/virtualbox/$file" ] && ln -sfv $out/bin/VBox.sh $out/bin/$file
done done
# Create and fix desktop item
ensureDir $out/share/applications ensureDir $out/share/applications
sed -i -e "s|Icon=VBox|Icon=$out/virtualbox/VBox.png|" $out/virtualbox/virtualbox.desktop
ln -sfv $out/virtualbox/virtualbox.desktop $out/share/applications ln -sfv $out/virtualbox/virtualbox.desktop $out/share/applications
''; '';

2
pkgs/top-level/all-packages.nix
View File

@ -5722,7 +5722,7 @@ let
virtualbox = import ../applications/virtualization/virtualbox { virtualbox = import ../applications/virtualization/virtualbox {
stdenv = stdenv_32bit; stdenv = stdenv_32bit;
inherit fetchurl lib iasl dev86 libxslt libxml2 qt3 SDL hal inherit fetchurl lib iasl dev86 libxslt libxml2 SDL hal
libcap libpng zlib kernel python which alsaLib curl; libcap libpng zlib kernel python which alsaLib curl;
qt4 = qt45; qt4 = qt45;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;