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

qt58.qtbase: fix developer build

Browse Source
This commit is contained in:
Thomas Tuegel 2017-04-23 17:52:48 -05:00
parent 52ac15953e
commit 64418af8c5
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
3 changed files with 19 additions and 3 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

@ -107,8 +107,10 @@ stdenv.mkDerivation {
"-system-proxies"
"-pkg-config"
]
++ lib.optional developerBuild "-developer-build"
++ lib.optionals developerBuild [
"-developer-build"
"-no-warnings-are-errors"
]
++ [
"-gui"
"-widgets"

14
pkgs/development/libraries/qt-5/5.8/qtbase/qnativesocketengine-type-pun.patch Normal file
View File

@ -0,0 +1,14 @@
Index: qtbase-opensource-src-5.8.0/src/network/socket/qnativesocketengine_unix.cpp
===================================================================
--- qtbase-opensource-src-5.8.0.orig/src/network/socket/qnativesocketengine_unix.cpp
+++ qtbase-opensource-src-5.8.0/src/network/socket/qnativesocketengine_unix.cpp
@@ -979,7 +979,8 @@ qint64 QNativeSocketEnginePrivate::nativ
if (cmsgptr->cmsg_len == CMSG_LEN(sizeof(int))
&& ((cmsgptr->cmsg_level == IPPROTO_IPV6 && cmsgptr->cmsg_type == IPV6_HOPLIMIT)
|| (cmsgptr->cmsg_level == IPPROTO_IP && cmsgptr->cmsg_type == IP_TTL))) {
- header->hopLimit = *reinterpret_cast<int *>(CMSG_DATA(cmsgptr));
+ int *ttl = reinterpret_cast<int *>(CMSG_DATA(cmsgptr));
+ header->hopLimit = *ttl;
}
#ifndef QT_NO_SCTP

2
pkgs/development/libraries/qt-5/5.8/qtbase/series
View File

@ -2,8 +2,8 @@ dlopen-resolv.patch
tzdir.patch
dlopen-libXcursor.patch
xdg-config-dirs.patch
compose-search-path.patch
libressl.patch
qpa-plugin-path.patch
dlopen-gl.patch
compose-search-path.patch
cmake-paths.patch