pyrox.dev
lol
qt58.qtserialport: use QLatin1String instead of QStringLiteral
+29
-36
-28
pkgs/development/libraries/qt-5/5.8/qtserialport/0001-dlopen-serialport-udev.patch
-28
pkgs/development/libraries/qt-5/5.8/qtserialport/0001-dlopen-serialport-udev.patch
···
1
-
From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001
2
-
From: Thomas Tuegel <ttuegel@gmail.com>
3
-
Date: Sun, 23 Aug 2015 09:16:02 -0500
4
-
Subject: [PATCH] dlopen serialport udev
5
-
6
-
---
7
-
src/serialport/qtudev_p.h | 4 ++--
8
-
1 file changed, 2 insertions(+), 2 deletions(-)
9
-
10
-
diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h
11
-
index 6f2cabd..81b9849 100644
12
-
--- a/src/serialport/qtudev_p.h
13
-
+++ b/src/serialport/qtudev_p.h
14
-
@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
15
-
inline bool resolveSymbols(QLibrary *udevLibrary)
16
-
{
17
-
if (!udevLibrary->isLoaded()) {
18
-
- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
19
-
+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
20
-
if (!udevLibrary->load()) {
21
-
- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
22
-
+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
23
-
if (!udevLibrary->load()) {
24
-
qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
25
-
return false;
26
-
--
27
-
2.5.0
28
-
+6
-8
pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix
+6
-8
pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix
···
1
-
{ stdenv, qtSubmodule, qtbase, substituteAll, systemd }:
1
+
{ stdenv, qtSubmodule, lib, copyPathsToStore, qtbase, substituteAll, systemd }:
2
2
3
-
with stdenv.lib;
3
+
let inherit (lib) getLib optional; in
4
4
5
5
qtSubmodule {
6
6
name = "qtserialport";
7
7
qtInputs = [ qtbase ];
8
-
patches = optionals (stdenv.isLinux) [
9
-
(substituteAll {
10
-
src = ./0001-dlopen-serialport-udev.patch;
11
-
libudev = systemd.lib;
12
-
})
13
-
];
8
+
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
9
+
NIX_CFLAGS_COMPILE =
10
+
optional stdenv.isLinux
11
+
''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"'';
14
12
}
+22
pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch
+22
pkgs/development/libraries/qt-5/5.8/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.8/qtserialport/series
+1
pkgs/development/libraries/qt-5/5.8/qtserialport/series
···
1
+
qtserialport-dlopen-udev.patch