nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtualbox: re-add support for virtio

Browse Source 
For some reason the original source tarball for version 6.1.14 didn't
bundle the sources for `virtio`-support causing a build-failure.

After this was reported, a new tarball named
`VirtualBox-6.1.14a.tar.bz2` was published which fixes the issue[1].

[1] https://www.virtualbox.org/ticket/19862
This commit is contained in:
Maximilian Bosch 2020-09-25 12:37:39 +02:00
parent e1538e43b9
commit 579404c4a5
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ let
# Use maintainers/scripts/update.nix to update the version and all related hashes or # Use maintainers/scripts/update.nix to update the version and all related hashes or
# change the hashes in extpack.nix and guest-additions/default.nix as well manually. # change the hashes in extpack.nix and guest-additions/default.nix as well manually.
version = "6.1.14"; version = "6.1.14";
tarballVersion = "${version}a";
iasl' = iasl.overrideAttrs (old: rec { iasl' = iasl.overrideAttrs (old: rec {
inherit (old) pname; inherit (old) pname;
@ -39,8 +40,8 @@ in stdenv.mkDerivation {
inherit version; inherit version;
src = fetchurl { src = fetchurl {
url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${tarballVersion}.tar.bz2";
sha256 = "91fa05bcfce36316ca93e3927c9550ea66286fff4c5bec900b753fca278ce1a0"; sha256 = "16f3cb83ab3c4dacf2a9d3cc638cbd18db23767828bba6b8ba1c1b57abeb6aef";
}; };
outputs = [ "out" "modsrc" ]; outputs = [ "out" "modsrc" ];
@ -120,8 +121,6 @@ in stdenv.mkDerivation {
NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${lib.getDev stdenv.cc.libc}/include,,g') NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${lib.getDev stdenv.cc.libc}/include,,g')
cat >> LocalConfig.kmk <<LOCAL_CONFIG cat >> LocalConfig.kmk <<LOCAL_CONFIG
VBOX_WITH_VIRTIO :=
VBOX_WITH_TESTCASES := VBOX_WITH_TESTCASES :=
VBOX_WITH_TESTSUITE := VBOX_WITH_TESTSUITE :=
VBOX_WITH_VALIDATIONKIT := VBOX_WITH_VALIDATIONKIT :=