From 4f33a90a5ead266def817773f7e4eb0b7be898c3 Mon Sep 17 00:00:00 2001 From: Bastian Köcher Date: Fri, 8 Jun 2018 11:01:41 +0200 Subject: virtualbox: Fixes build with Qt5.11 --- pkgs/applications/virtualization/virtualbox/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'pkgs/applications/virtualization/virtualbox') 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|' \ -- cgit 1.4.1