Author: egorochkin
Date: Sun Nov 28 10:14:07 2010
New Revision: 24903
URL: https://svn.nixos.org/websvn/nix/?rev=24903&sc=1
Log:
Virtualbox guest additions: fix runtime dep on which. Patch by Rohan Hart.
Modified:
nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
Sun Nov 28 10:07:49 2010 (r24902)
+++
nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
Sun Nov 28 10:14:07 2010 (r24903)
@@ -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 @@
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 @@
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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
