Author: eelco
Date: Fri Mar 2 14:54:14 2012
New Revision: 32745
URL: https://nixos.org/websvn/nix/?rev=32745&sc=1
Log:
* VirtualBox: drop the unnecessary dependency on HAL.
Modified:
nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/default.nix
Modified: nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/default.nix
Fri Mar 2 14:46:58 2012 (r32744)
+++ nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/default.nix
Fri Mar 2 14:54:14 2012 (r32745)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto,
libXext
-, libXcursor, libXmu, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
+, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel
, python, which, alsaLib, curl, gawk
, xorriso, makeself, perl, jdk, pkgconfig
}:
@@ -16,7 +16,7 @@
buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL
SDL
- hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk
+ libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk
pkgconfig which libXmu
];
@@ -49,19 +49,23 @@
echo "VBOX_WITH_WARNINGS_AS_ERRORS :=" >> LocalConfig.kmk
'';
- buildPhase = ''
+ enableParallelBuilding = true;
+
+ preBuild = ''
source env.sh
kmk
cd out/linux.*/release/bin/src
export KERN_DIR=${kernel}/lib/modules/*/build
- make
+ '';
+
+ postBuild = ''
cd ../../../../..
'';
installPhase = ''
# Install VirtualBox files
cd out/linux.*/release/bin
- ensureDir $out/virtualbox
+ mkdir -p $out/virtualbox
cp -av * $out/virtualbox
# Install kernel module
@@ -80,7 +84,7 @@
make install
# Create wrapper script
- ensureDir $out/bin
+ mkdir -p $out/bin
cp -v ${./VBox.sh} $out/bin/VBox.sh
sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \
-e "s|@QT4_PATH@|${qt4}/lib|" \
@@ -94,7 +98,7 @@
done
# Create and fix desktop item
- ensureDir $out/share/applications
+ mkdir -p $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
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
