diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-06-23 13:57:13 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2013-06-23 14:16:21 +0200 |
| commit | 45f7b9c319d9f5659278391ea660025953b0a07d (patch) | |
| tree | 99a2b33184785bec17d1624c3482895f4c5333dc /pkgs/applications/virtualization/virtualbox | |
| parent | 43c9ab900b884bd981e00d59845bb07d042794d1 (diff) | |
| download | nixlib-45f7b9c319d9f5659278391ea660025953b0a07d.tar nixlib-45f7b9c319d9f5659278391ea660025953b0a07d.tar.gz nixlib-45f7b9c319d9f5659278391ea660025953b0a07d.tar.bz2 nixlib-45f7b9c319d9f5659278391ea660025953b0a07d.tar.lz nixlib-45f7b9c319d9f5659278391ea660025953b0a07d.tar.xz nixlib-45f7b9c319d9f5659278391ea660025953b0a07d.tar.zst nixlib-45f7b9c319d9f5659278391ea660025953b0a07d.zip | |
virtualbox: make guest additions use driver according to xserver version
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/guest-additions/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 98fffe90ff6e..50449b8f0940 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,8 +1,11 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernelDev, which, makeWrapper -, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor -, dbus }: +, xorg, dbus }: -let version = "4.2.12"; in +let + version = "4.2.12"; + xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version); + xserverABI = xserverVListFunc 0 + xserverVListFunc 1; +in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}-${kernelDev.version}"; @@ -22,7 +25,7 @@ stdenv.mkDerivation { ''; - buildCommand = '' + buildCommand = with xorg; '' ${if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then '' isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run chmod 755 ./VBoxLinuxAdditions.run @@ -104,7 +107,7 @@ stdenv.mkDerivation { # Install Xorg drivers mkdir -p $out/lib/xorg/modules/{drivers,input} - install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_113.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so + install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_${xserverABI}.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so # Install kernel modules cd src |