pyrox.dev
lol
qt56.qtserialport: use QLatin1String instead of QStringLiteral
+33
-10
+3
-3
pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch
+3
-3
pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch
···
11
11
index 6f2cabd..81b9849 100644
12
12
--- a/src/serialport/qtudev_p.h
13
13
+++ b/src/serialport/qtudev_p.h
14
-
@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
14
+
@@ -105,10 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
15
15
inline bool resolveSymbols(QLibrary *udevLibrary)
16
16
{
17
17
if (!udevLibrary->isLoaded()) {
18
18
- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
19
-
+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
19
+
+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1);
20
20
if (!udevLibrary->load()) {
21
21
- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
22
-
+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
22
+
+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0);
23
23
if (!udevLibrary->load()) {
24
24
qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
25
25
return false;
+7
-7
pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix
+7
-7
pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix
···
1
-
{ qtSubmodule, qtbase, substituteAll, systemd }:
1
+
{ stdenv, qtSubmodule, lib, copyPathsToStore, qtbase, substituteAll, systemd }:
2
+
3
+
let inherit (lib) getLib optional; in
2
4
3
5
qtSubmodule {
4
6
name = "qtserialport";
5
7
qtInputs = [ qtbase ];
6
-
patches = [
7
-
(substituteAll {
8
-
src = ./0001-dlopen-serialport-udev.patch;
9
-
libudev = systemd.lib;
10
-
})
11
-
];
8
+
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
9
+
NIX_CFLAGS_COMPILE =
10
+
optional stdenv.isLinux
11
+
''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"'';
12
12
}
+22
pkgs/development/libraries/qt-5/5.6/qtserialport/qtserialport-dlopen-udev.patch
+22
pkgs/development/libraries/qt-5/5.6/qtserialport/qtserialport-dlopen-udev.patch
···
1
+
Index: qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h
2
+
===================================================================
3
+
--- qtserialport-opensource-src-5.8.0.orig/src/serialport/qtudev_p.h
4
+
+++ qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h
5
+
@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QL
6
+
inline bool resolveSymbols(QLibrary *udevLibrary)
7
+
{
8
+
if (!udevLibrary->isLoaded()) {
9
+
+#ifdef NIXPKGS_LIBUDEV
10
+
+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1);
11
+
+#else
12
+
udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
13
+
+#endif
14
+
if (!udevLibrary->load()) {
15
+
+#ifdef NIXPKGS_LIBUDEV
16
+
+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0);
17
+
+#else
18
+
udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
19
+
+#endif
20
+
if (!udevLibrary->load()) {
21
+
qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
22
+
return false;
+1
pkgs/development/libraries/qt-5/5.6/qtserialport/series
+1
pkgs/development/libraries/qt-5/5.6/qtserialport/series
···
1
+
qtserialport-dlopen-udev.patch