public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Start trying to actually use the extpack in the virtualbox derivation.

Browse Source
This commit is contained in:
(cdep)illabout 2018-08-10 14:28:57 +09:00
parent 60f2b476e4
commit d2b5e6eafe
No known key found for this signature in database
GPG Key ID: 462E0C03D11422F4
3 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -6,7 +6,7 @@
, xorriso, makeself, perl , xorriso, makeself, perl
, javaBindings ? false, jdk ? null , javaBindings ? false, jdk ? null
, pythonBindings ? false, python2 ? null , pythonBindings ? false, python2 ? null
, enableExtensionPack ? false, requireFile ? null, fakeroot ? null , extensionPack ? null, fakeroot ? null
, pulseSupport ? false, libpulseaudio ? null , pulseSupport ? false, libpulseaudio ? null
, enableHardening ? false , enableHardening ? false
, headless ? false , headless ? false
@ -19,30 +19,9 @@ with stdenv.lib;
let let
python = python2; python = python2;
buildType = "release"; buildType = "release";
# Manually sha256sum the extensionPack file, must be hex! # Remember to change the extpackRev and version in extpack.nix as well.
# Do not forget to update the hash in ./guest-additions/default.nix!
extpack = "d90c1b0c89de19010f7c7fe7a675ac744067baf29a9966b034e97b5b2053b37e";
extpackRev = "123301";
main = "ee3af129a581ec4c1a3e777e98247f8943e976ce6edd24962bcaa5c53ed1f644"; main = "ee3af129a581ec4c1a3e777e98247f8943e976ce6edd24962bcaa5c53ed1f644";
version = "5.2.14"; version = "5.2.14";
# See https://github.com/NixOS/nixpkgs/issues/672 for details
extensionPack = requireFile rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${toString extpackRev}.vbox-extpack";
sha256 = extpack;
message = ''
In order to use the extension pack, you need to comply with the VirtualBox Personal Use
and Evaluation License (PUEL) available at:
https://www.virtualbox.org/wiki/VirtualBox_PUEL
Once you have read and if you agree with the license, please use the
following command and re-run the installation:
nix-prefetch-url http://download.virtualbox.org/virtualbox/${version}/${name}
'';
};
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "virtualbox-${version}"; name = "virtualbox-${version}";
@ -174,7 +153,7 @@ in stdenv.mkDerivation {
ln -s "$libexec/$file" $out/bin/$file ln -s "$libexec/$file" $out/bin/$file
done done
${optionalString enableExtensionPack '' ${optionalString (extensionPack != null) ''
mkdir -p "$share" mkdir -p "$share"
"${fakeroot}/bin/fakeroot" "${stdenv.shell}" <<EXTHELPER "${fakeroot}/bin/fakeroot" "${stdenv.shell}" <<EXTHELPER
"$libexec/VBoxExtPackHelperApp" install \ "$libexec/VBoxExtPackHelperApp" install \

11
pkgs/applications/virtualization/virtualbox/extpack.nix
View File

@ -5,15 +5,10 @@ with lib;
let extpackRev = "123301"; let extpackRev = "123301";
version = "5.2.14"; version = "5.2.14";
in in
stdenv.mkDerivation rec { fetchurl rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${toString extpackRev}.vbox-extpack"; name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${toString extpackRev}.vbox-extpack";
src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/${name}";
url = "http://download.virtualbox.org/virtualbox/${version}/${name}"; sha256 = "d90c1b0c89de19010f7c7fe7a675ac744067baf29a9966b034e97b5b2053b37e";
sha256 = "d90c1b0c89de19010f7c7fe7a675ac744067baf29a9966b034e97b5b2053b37e";
};
installPhase = "cp -r . $out";
phases = ["installPhase"];
meta = { meta = {
description = "Oracle Extension pack for VirtualBox"; description = "Oracle Extension pack for VirtualBox";

7
pkgs/top-level/all-packages.nix
View File

@ -18851,7 +18851,6 @@ with pkgs;
virtualbox = callPackage ../applications/virtualization/virtualbox { virtualbox = callPackage ../applications/virtualization/virtualbox {
stdenv = stdenv_32bit; stdenv = stdenv_32bit;
inherit (gnome2) libIDL; inherit (gnome2) libIDL;
enableExtensionPack = config.virtualbox.enableExtensionPack or false;
pulseSupport = config.pulseaudio or true; pulseSupport = config.pulseaudio or true;
}; };
@ -18864,7 +18863,11 @@ with pkgs;
headless = true; headless = true;
}); });
virtualbox-extpack = callPackage ../applications/virtualization/virtualbox/extpack.nix { }; virtualboxExtpack = callPackage ../applications/virtualization/virtualbox/extpack.nix { };
virtualboxWithExtpack = lowPrio (virtualbox.override {
extensionPack = virtualboxExtpack;
});
virtualglLib = callPackage ../tools/X11/virtualgl/lib.nix { virtualglLib = callPackage ../tools/X11/virtualgl/lib.nix {
fltk = fltk13; fltk = fltk13;