diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-23 11:02:49 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:44:46 -0500 |
| commit | b7f895d9725fd17c682f2f2625656c8816354a9f (patch) | |
| tree | 1254e222d180dbfbc5d8f2193dc4aefdb0022950 /pkgs/development/libraries/kde-frameworks | |
| parent | d9094c087e73ebc4aca615a354ec58194d2c1bc3 (diff) | |
| download | nixlib-b7f895d9725fd17c682f2f2625656c8816354a9f.tar nixlib-b7f895d9725fd17c682f2f2625656c8816354a9f.tar.gz nixlib-b7f895d9725fd17c682f2f2625656c8816354a9f.tar.bz2 nixlib-b7f895d9725fd17c682f2f2625656c8816354a9f.tar.lz nixlib-b7f895d9725fd17c682f2f2625656c8816354a9f.tar.xz nixlib-b7f895d9725fd17c682f2f2625656c8816354a9f.tar.zst nixlib-b7f895d9725fd17c682f2f2625656c8816354a9f.zip | |
kwindowsystem: use QLatin1String instead of QStringLiteral
Diffstat (limited to 'pkgs/development/libraries/kde-frameworks')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index ba43a5668a7c..fa9078eeb205 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -17,4 +17,5 @@ mkDerivation { preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\"" ''; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch index ed24897d342a..ae0da37922e9 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch @@ -14,7 +14,7 @@ Index: kwindowsystem-5.32.0/src/pluginwrapper.cpp - foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) { - 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)) { + ret << pluginDir.absoluteFilePath(entry); } |