summary refs log tree commit diff
path: root/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch
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/fix-configure-pkgconfig-qt.patch
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/fix-configure-pkgconfig-qt.patch')
-rw-r--r--pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch b/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch
new file mode 100644
index 00000000000..0594a2f19d4
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch
@@ -0,0 +1,11 @@
+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"