Unverified Commit 5701e5bc authored by Markus Partheymueller's avatar Markus Partheymueller Committed by GitHub
Browse files

virtualbox: 6.1.22 -> 6.1.26 (#132223) 



Co-authored-by: default avatarSandro <sandro.jaeckel@gmail.com>
parent cd9938d1

pkgs/applications/virtualization/virtualbox/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ let 
  buildType = "release";

  # 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.

  version = "6.1.22";

  version = "6.1.26";



  iasl' = iasl.overrideAttrs (old: rec {

    inherit (old) pname;
@@ -40,7 +40,7 @@ in stdenv.mkDerivation { 


  src = fetchurl {

    url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";

    sha256 = "99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49";

    sha256 = "0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195";

  };



  outputs = [ "out" "modsrc" ];
@@ -104,6 +104,9 @@ in stdenv.mkDerivation { 
    })

  ++ [

    ./qtx11extras.patch

    # Temporary workaround for broken build

    # https://www.virtualbox.org/pipermail/vbox-dev/2021-July/015670.html

    ./fix-configure-pkgconfig-qt.patch

  ];



  postPatch = ''

pkgs/applications/virtualization/virtualbox/extpack.nix

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ fetchurl rec { 
    # Manually sha256sum the extensionPack file, must be hex!

    # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.

    # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS

    let value = "6d33d9cc1c5a8f8a2a70e5aaaa778a341322d2ba7eb34f7de420fb5f312b9e87";

    let value = "aaa1a1f8615d5bd2e08b158ce6f415262fbb595e169e2d415c5b1844ac258eee";

    in assert (builtins.stringLength value) == 64; value;



  meta = {

pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
Index: /trunk/configure

===================================================================

--- a/configure	(revision 90360)

+++ b/configure	(revision 90377)

@@ -1588,5 +1588,5 @@

         if [ $? -eq 0 ]; then

           echo "(Qt5 from pkg-config)" >> $LOG

-          FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags`

+          FLGQT5=`pkg-config Qt5Core --cflags`

           # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)

           [ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11"

pkgs/applications/virtualization/virtualbox/guest-additions/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { 


  src = fetchurl {

    url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";

    sha256 = "bffc316a7b8d5ed56d830e9f6aef02b4e5ffc28674032142e96ffbedd905f8c9";

    sha256 = "22d02ec417cd7723d7269dbdaa71c48815f580c0ca7a0606c42bd623f84873d7";

  };



  KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";