BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Virtualbox guest additions: fix runtime dep on which. Patch by Rohan Hart.

Browse source 
svn path=/nixpkgs/trunk/; revision=24903
This commit is contained in:
Evgeny Egorochkin 2010-11-28 10:14:07 +00:00
parent 51492e5533
commit b909a4ce76
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
stdenv.mkDerivation {
@ -8,7 +8,14 @@ stdenv.mkDerivation {
sha256 = "1pyfgrcdmw6zf3yxgzcd8c5qzqqn62bz4085ka453gfmi9d65lys";
};
KERN_DIR = "${kernel}/lib/modules/*/build";
buildInputs = [ patchelf cdrkit ];
buildInputs = [ patchelf cdrkit makeWrapper ];
installPhase = ''
ensureDir $out
cp -r install/* $out
'';
buildCommand = ''
${if stdenv.system == "i686-linux" then ''
isoinfo -J -i $src -x /VBoxLinuxAdditions-x86.run > ./VBoxLinuxAdditions-x86.run
@ -73,6 +80,9 @@ stdenv.mkDerivation {
install -m 755 bin/VBoxControl $out/bin
install -m 755 bin/VBoxClient-all $out/bin
wrapProgram $out/bin/VBoxClient-all \
--prefix PATH : "${which}/bin"
# Install OpenGL libraries
ensureDir $out/lib
cp -v lib/VBoxOGL*.so $out/lib