diff options
author | Shea Levy <shea@shealevy.com> | 2012-02-25 19:57:34 +0000 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2012-02-25 19:57:34 +0000 |
commit | ea195b2507b9068d966009d27c0e90b57d88f30d (patch) | |
tree | 287b4453ffa21139715bb1c1c57e6d01d1045295 /pkgs/applications/virtualization/virtualbox | |
parent | 38e3d7bc86d2a48dd4d653fd3f142f422c075563 (diff) | |
parent | 385f242a400749b3923d51fff5a86403e6dab0dc (diff) | |
download | nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.gz nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.bz2 nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.lz nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.xz nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.zst nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.zip |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox')
-rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index e0665909a8d5..7214dad6bcc0 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,33 +1,37 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext -, libXcursor, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel +, libXcursor, libXmu, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel , python, which, alsaLib, curl, gawk -, xorriso, makeself, perl, jdk +, xorriso, makeself, perl, jdk, pkgconfig }: -let version = "4.1.6"; in +let version = "4.1.8"; in stdenv.mkDerivation { name = "virtualbox-${version}-${kernel.version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "0zmbq0h9g4lamzmxqg281nr9pp88606dxh2dsw6vy1m86g5kfham"; + sha256 = "1q04825ayynzgh8zl6y038lzxp3jk1a3dxpg6f52kk4vkirdc5pg"; }; - buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk ]; + buildInputs = + [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL + hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk + pkgconfig which libXmu + ]; - patchPhase = " + patchPhase = '' set -x MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build` - sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \\ - -e 's@MKISOFS --version@MKISOFS -version@' \\ + sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \ + -e 's@MKISOFS --version@MKISOFS -version@' \ -i configure ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 find . -type f | xargs sed 's/depmod -a/true/' -i export USER=nix set +x - "; + ''; configurePhase = '' ./configure --with-qt4-dir=${qt4} --disable-python --disable-pulse --disable-hardening --with-mkisofs=${xorriso}/bin/xorrisofs |