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.
This commit is contained in:
parent
5735edb894
commit
577c4f543b
@ -234,9 +234,6 @@ stdenv.mkDerivation {
|
|||||||
''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
|
''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
|
||||||
''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"''
|
''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"''
|
||||||
''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
|
''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
|
||||||
(if stdenv.isLinux
|
|
||||||
then ''-DNIXPKGS_LIBDBUS="${dbus.lib}/lib/libdbus-1"''
|
|
||||||
else ''-DNIXPKGS_LIBDBUS=""'')
|
|
||||||
]
|
]
|
||||||
|
|
||||||
++ lib.optional mesaSupported
|
++ lib.optional mesaSupported
|
||||||
|
@ -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();
|
|
@ -1,7 +1,6 @@
|
|||||||
dlopen-resolv.patch
|
dlopen-resolv.patch
|
||||||
tzdir.patch
|
tzdir.patch
|
||||||
dlopen-libXcursor.patch
|
dlopen-libXcursor.patch
|
||||||
dlopen-dbus.patch
|
|
||||||
xdg-config-dirs.patch
|
xdg-config-dirs.patch
|
||||||
compose-search-path.patch
|
compose-search-path.patch
|
||||||
libressl.patch
|
libressl.patch
|
||||||
|
Loading…
x
Reference in New Issue
Block a user