alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

qt58.qtbase: Fix path to libresolv

Browse source
This commit is contained in:
Thomas Tuegel 2017-04-15 11:33:47 -05:00
parent 6169bd98f5
commit 40aa757898
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
View file

@ -53,11 +53,6 @@ stdenv.mkDerivation {
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"
substituteInPlace src/network/kernel/qdnslookup_unix.cpp \
--replace "@glibc@" "${stdenv.cc.libc.out}"
substituteInPlace src/network/kernel/qhostinfo_unix.cpp \
--replace "@glibc@" "${stdenv.cc.libc.out}"
substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \
--replace "@openssl@" "${openssl.out}"
'' + lib.optionalString stdenv.isLinux ''
@ -229,6 +224,7 @@ stdenv.mkDerivation {
[
"-Wno-error=sign-compare"
''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"''
]
++ lib.optionals stdenv.isDarwin
[

4
pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
View file

@ -7,7 +7,7 @@ Index: qtbase-opensource-src-5.8.0/src/network/kernel/qdnslookup_unix.cpp
#endif
{
- lib.setFileName(QLatin1String("resolv"));
+ lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
+ lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));
if (!lib.load())
return false;
}
@ -20,7 +20,7 @@ Index: qtbase-opensource-src-5.8.0/src/network/kernel/qhostinfo_unix.cpp
#endif
{
- lib.setFileName(QLatin1String("resolv"));
+ lib.setFileName(QLatin1String("@glibc@/lib/libresolv"));
+ lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));
if (!lib.load())
return false;
}