From 577c4f543b53bb921a61e54e73c95436db2a29cf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 22 Apr 2017 12:30:41 -0500
Subject: [PATCH] qt58.qtbase: remove D-Bus library paths patch

Qt is configured with `-dbus-linked` which causes the library paths to be
resolved at compile time and added to RPATH.
---
 .../libraries/qt-5/5.8/qtbase/default.nix           |  3 ---
 .../libraries/qt-5/5.8/qtbase/dlopen-dbus.patch     | 13 -------------
 pkgs/development/libraries/qt-5/5.8/qtbase/series   |  1 -
 3 files changed, 17 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index ab696d28021..c0454e91add 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -234,9 +234,6 @@ stdenv.mkDerivation {
       ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
       ''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"''
       ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
-      (if stdenv.isLinux
-        then ''-DNIXPKGS_LIBDBUS="${dbus.lib}/lib/libdbus-1"''
-        else ''-DNIXPKGS_LIBDBUS=""'')
     ]
 
     ++ lib.optional mesaSupported
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch
deleted file mode 100644
index 067d898cda4..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qtbase-opensource-src-5.8.0/src/dbus/qdbus_symbols.cpp
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/dbus/qdbus_symbols.cpp
-+++ qtbase-opensource-src-5.8.0/src/dbus/qdbus_symbols.cpp
-@@ -97,7 +97,7 @@ bool qdbus_loadLibDBus()
- #ifdef Q_OS_WIN
-         QLatin1String("dbus-1"),
- #endif
--        QLatin1String("libdbus-1")
-+        QLatin1String("@dbus_libs@/lib/libdbus-1")
-     };
- 
-     lib->unload();
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index 37278bd5dba..dfe9575d8b2 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -1,7 +1,6 @@
 dlopen-resolv.patch
 tzdir.patch
 dlopen-libXcursor.patch
-dlopen-dbus.patch
 xdg-config-dirs.patch
 compose-search-path.patch
 libressl.patch