summary refs log tree commit diff
path: root/pkgs/applications/virtualization/virtualbox/default.nix
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2021-08-02 17:08:40 +0200
committerGitHub <noreply@github.com>2021-08-02 17:08:40 +0200
commit15ffca434eb8c47d472c3508abe10616022b31a4 (patch)
treeb0e73ab8b0c835d2a3c6fe6dfecb547d81661cc4 /pkgs/applications/virtualization/virtualbox/default.nix
parenta476da069049bbdd1630ba1bc66e0ba0512cff15 (diff)
parent5701e5bc3bfb317e1f37ff3fb889eae7584a1206 (diff)
downloadnixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar
nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.gz
nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.bz2
nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.lz
nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.xz
nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.zst
nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.zip
Merge branch 'master' into meshcentral
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox/default.nix')
-rw-r--r--pkgs/applications/virtualization/virtualbox/default.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 0bc3af364e6..31f48576803 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -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 = ''