public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt58.qtbase: Fix path to libresolv

Browse Source
This commit is contained in:
Thomas Tuegel
2017-04-28 05:49:34 -05:00
parent 6169bd98f5
commit 40aa757898
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+1 -5
View File
@@ -53,11 +53,6 @@ stdenv.mkDerivation {
sed -i 's/NO_DEFAULT_PATH//' "src/gui/Qt5GuiConfigExtras.cmake.in" 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" 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 \ substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \
--replace "@openssl@" "${openssl.out}" --replace "@openssl@" "${openssl.out}"
'' + lib.optionalString stdenv.isLinux '' '' + lib.optionalString stdenv.isLinux ''
@@ -229,6 +224,7 @@ stdenv.mkDerivation {
[ [
"-Wno-error=sign-compare" "-Wno-error=sign-compare"
''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"'' ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"''
] ]
++ lib.optionals stdenv.isDarwin ++ lib.optionals stdenv.isDarwin
[ [
pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
+2 -2
View File
@@ -7,7 +7,7 @@ Index: qtbase-opensource-src-5.8.0/src/network/kernel/qdnslookup_unix.cpp
#endif #endif
{ {
- lib.setFileName(QLatin1String("resolv")); - lib.setFileName(QLatin1String("resolv"));
+ lib.setFileName(QLatin1String("@glibc@/lib/resolv")); + lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));
if (!lib.load()) if (!lib.load())
return false; return false;
} }
@@ -20,7 +20,7 @@ Index: qtbase-opensource-src-5.8.0/src/network/kernel/qhostinfo_unix.cpp
#endif #endif
{ {
- lib.setFileName(QLatin1String("resolv")); - lib.setFileName(QLatin1String("resolv"));
+ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); + lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));
if (!lib.load()) if (!lib.load())
return false; return false;
} }