b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #109324 from tpwrules/lxqt-fix-locations

Browse source 
lxqt: fix themes and translations
This commit is contained in:
Jörg Thalheim 2021-01-14 18:25:26 +00:00 committed by GitHub
parent 2416b9da70 b6779d541a
commit e1ac6eba34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/desktops/lxqt/liblxqt/default.nix
View file

@ -39,6 +39,9 @@ mkDerivation rec {
xorg.libXScrnSaver
];
# convert name of wrapped binary, e.g. .lxqt-whatever-wrapped to the original name, e.g. lxqt-whatever so binaries can find their resources
patches = [ ./fix-application-path.patch ];
postPatch = ''
sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt
'';

23
pkgs/desktops/lxqt/liblxqt/fix-application-path.patch Normal file
View file

@ -0,0 +1,23 @@
--- a/lxqtapplication.cpp
+++ b/lxqtapplication.cpp
@@ -77,7 +77,7 @@ Application::Application(int &argc, char** argv, bool handleQuitSignals)
void Application::updateTheme()
{
- const QString styleSheetKey = QFileInfo(applicationFilePath()).fileName();
+ const QString styleSheetKey = QFileInfo(applicationFilePath()).fileName().mid(1).chopped(8);
setStyleSheet(lxqtTheme.qss(styleSheetKey));
Q_EMIT themeChanged();
}
--- a/lxqttranslator.cpp
+++ b/lxqttranslator.cpp
@@ -147,7 +147,7 @@ bool Translator::translateApplication(const QString &applicationName)
if (!applicationName.isEmpty())
return translate(applicationName);
else
- return translate(QFileInfo(QCoreApplication::applicationFilePath()).baseName());
+ return translate(QFileInfo(QCoreApplication::applicationFilePath()).baseName().mid(1).chopped(8));
}