about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorBastian Köcher <git@kchr.de>2018-06-08 11:01:41 +0200
committerBastian Köcher <git@kchr.de>2018-06-12 16:42:29 +0200
commit4f33a90a5ead266def817773f7e4eb0b7be898c3 (patch)
tree6a7487fbff7c42fe5428232cf6a2a5a092de20f5 /pkgs
parent738df73f2acc96f1d06d4ef6b8dbaf8bee7ef9f1 (diff)
downloadnixlib-4f33a90a5ead266def817773f7e4eb0b7be898c3.tar
nixlib-4f33a90a5ead266def817773f7e4eb0b7be898c3.tar.gz
nixlib-4f33a90a5ead266def817773f7e4eb0b7be898c3.tar.bz2
nixlib-4f33a90a5ead266def817773f7e4eb0b7be898c3.tar.lz
nixlib-4f33a90a5ead266def817773f7e4eb0b7be898c3.tar.xz
nixlib-4f33a90a5ead266def817773f7e4eb0b7be898c3.tar.zst
nixlib-4f33a90a5ead266def817773f7e4eb0b7be898c3.zip
virtualbox: Fixes build with Qt5.11
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/virtualization/virtualbox/default.nix17
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 3c5d3e6dc1b0..da092bed47be 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
-, libXcursor, libXmu, qt5, libIDL, SDL, libcap, zlib, libpng, glib, lvm2
-, libXrandr, libXinerama
+{ stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2
+, libX11, xproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap
+, zlib, libpng, glib, lvm2, libXrandr, libXinerama
 , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
 , alsaLib, curl, libvpx, gawk, nettools, dbus
 , xorriso, makeself, perl
@@ -94,9 +94,14 @@ in stdenv.mkDerivation {
 
   patches =
      optional enableHardening ./hardened.patch
-  ++ [ ./qtx11extras.patch ];
-
-
+  ++ [
+    ./qtx11extras.patch
+    (fetchpatch {
+      name = "010-qt-5.11.patch";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/010-qt-5.11.patch?h=packages/virtualbox";
+      sha256 = "0hjx99pg40wqyggnrpylrp5zngva4xrnk7r90i0ynrqc7n84g9pn";
+    })
+  ];
 
   postPatch = ''
     sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \