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

qt58.qtbase: Fix QTCOMPOSE search patch

Browse Source
This commit is contained in:
Thomas Tuegel 2017-04-15 11:23:48 -05:00
parent 2ce3fe0a71
commit 12c981d4b7
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
View File

@ -2,7 +2,7 @@ Index: qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/gen
=================================================================== ===================================================================
--- qtbase-opensource-src-5.8.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp --- qtbase-opensource-src-5.8.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -258,10 +258,7 @@ void TableGenerator::initPossibleLocatio @@ -258,12 +258,9 @@ void TableGenerator::initPossibleLocatio
m_possibleLocations.reserve(7); m_possibleLocations.reserve(7);
if (qEnvironmentVariableIsSet("QTCOMPOSE")) if (qEnvironmentVariableIsSet("QTCOMPOSE"))
m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
@ -10,7 +10,9 @@ Index: qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/gen
- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale")); - m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));
- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); - m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale")); - m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
+ m_possibleLocations.append(QStringLiteral("${libX11}/share/X11/locale"));
m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
+ m_possibleLocations.append(QStringLiteral(NIXPKGS_QTCOMPOSE));
} }
QString TableGenerator::findComposeFile()

5
pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
View File

@ -66,10 +66,6 @@ stdenv.mkDerivation {
substituteInPlace src/dbus/qdbus_symbols.cpp \ substituteInPlace src/dbus/qdbus_symbols.cpp \
--replace "@dbus_libs@" "${dbus.lib}" --replace "@dbus_libs@" "${dbus.lib}"
substituteInPlace \
src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
--replace "@libX11@" "${libX11.out}"
'' ''
+ lib.optionalString mesaSupported '' + lib.optionalString mesaSupported ''
substituteInPlace \ substituteInPlace \
@ -232,6 +228,7 @@ stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE =
[ [
"-Wno-error=sign-compare" "-Wno-error=sign-compare"
''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
] ]
++ lib.optionals stdenv.isDarwin ++ lib.optionals stdenv.isDarwin
[ [