From 8e2b6a90c09d39de5f43eb94376000f1776e0657 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 15 Apr 2017 11:39:50 -0500 Subject: [PATCH] qt58.qtbase: Fix path to libdbus --- pkgs/development/libraries/qt-5/5.8/qtbase/default.nix | 6 +++--- .../development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 f137984862a..62ff9c2ea51 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix @@ -52,9 +52,6 @@ stdenv.mkDerivation { sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5CoreMacros.cmake" sed -i 's/NO_DEFAULT_PATH//' "src/gui/Qt5GuiConfigExtras.cmake.in" sed -i 's/PATHS.*NO_DEFAULT_PATH//' "mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" - '' + lib.optionalString stdenv.isLinux '' - substituteInPlace src/dbus/qdbus_symbols.cpp \ - --replace "@dbus_libs@" "${dbus.lib}" '' + lib.optionalString mesaSupported '' substituteInPlace \ @@ -222,6 +219,9 @@ stdenv.mkDerivation { ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' ''-DNIXPKGS_LIBSSL="${openssl.out}/lib/libssl"'' ''-DNIXPKGS_LIBCRYPTO="${openssl.out}/lib/libcrypto"'' + (if stdenv.isLinux + then ''-DNIXPKGS_LIBDBUS="${dbus.lib}/lib/libdbus-1"'' + else ''-DNIXPKGS_LIBDBUS=""'') ] ++ lib.optionals stdenv.isDarwin [ 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 index 10b0b6701dd..067d898cda4 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch @@ -1,7 +1,7 @@ -Index: qtbase-opensource-src-5.7.0/src/dbus/qdbus_symbols.cpp +Index: qtbase-opensource-src-5.8.0/src/dbus/qdbus_symbols.cpp =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/dbus/qdbus_symbols.cpp -+++ qtbase-opensource-src-5.7.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"),