nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 19:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

kwindowsystem: use QLatin1String instead of QStringLiteral

Browse Source
This commit is contained in:
Thomas Tuegel 2017-05-23 11:02:49 -05:00
parent d9094c087e
commit b7f895d972
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
View File

@ -17,4 +17,5 @@ mkDerivation {
preConfigure = '' preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\"" NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\""
''; '';
outputs = [ "out" "dev" ];
} }

2
pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
View File

@ -14,7 +14,7 @@ Index: kwindowsystem-5.32.0/src/pluginwrapper.cpp
- foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) { - foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) {
- ret << pluginDir.absoluteFilePath(entry); - ret << pluginDir.absoluteFilePath(entry);
- } - }
+ QDir pluginDir(QStringLiteral(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms")); + QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));
+ foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) { + foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) {
+ ret << pluginDir.absoluteFilePath(entry); + ret << pluginDir.absoluteFilePath(entry);
} }