diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-05 10:00:23 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-05 10:00:23 +0000 |
| commit | 57fd764a391a6215165c377e1936204f297905c9 (patch) | |
| tree | e93f78b2cb4718187f5b693e3655499ee6ba485a /pkgs/applications/virtualization | |
| parent | a88fdf8ef7cd09efb795b2b3a7e41ec95bdc457f (diff) | |
| parent | e657e2c455d17fddd6d79eb93a1d08836a2e2b28 (diff) | |
| download | nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar.gz nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar.bz2 nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar.lz nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar.xz nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar.zst nixpkgs-57fd764a391a6215165c377e1936204f297905c9.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 7214dad6bcc..76cc945baef 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -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 @@ stdenv.mkDerivation { 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,12 +49,16 @@ stdenv.mkDerivation { 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 ../../../../.. ''; |