diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-04-15 11:33:47 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-04-28 05:49:34 -0500 |
| commit | 40aa757898cba35090bdece5cb1949315a366232 (patch) | |
| tree | 591c5dde7c5999b8834ffa6687708c05cc2130c5 /pkgs | |
| parent | 6169bd98f51429d7da4f2fc296357d8e6d828751 (diff) | |
| download | nixpkgs-40aa757898cba35090bdece5cb1949315a366232.tar nixpkgs-40aa757898cba35090bdece5cb1949315a366232.tar.gz nixpkgs-40aa757898cba35090bdece5cb1949315a366232.tar.bz2 nixpkgs-40aa757898cba35090bdece5cb1949315a366232.tar.lz nixpkgs-40aa757898cba35090bdece5cb1949315a366232.tar.xz nixpkgs-40aa757898cba35090bdece5cb1949315a366232.tar.zst nixpkgs-40aa757898cba35090bdece5cb1949315a366232.zip | |
qt58.qtbase: Fix path to libresolv
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.8/qtbase/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch | 4 |
2 files changed, 3 insertions, 7 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 11e5119ce13..3e667d5cc40 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix @@ -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 [ diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch index 1df27377658..ef7cd4a910a 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch @@ -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; } |