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

calamares: add locale path patch

Browse Source
This commit is contained in:
Victor Fuentes 2022-07-30 18:58:44 -07:00
parent 71d2c63882
commit 0e4af0e816
No known key found for this signature in database
GPG Key ID: 0A88B68D6A9ACAE0
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/misc/calamares/default.nix
View File

@ -36,6 +36,8 @@ mkDerivation rec {
# Fix setting the kayboard layout on GNOME wayland
# By default the module uses the setxkbmap, which will not change the keyboard
./waylandkbd.patch
# Change default location where calamares searches for locales
./supportedlocale.patch
];
nativeBuildInputs = [ cmake extra-cmake-modules ];

13
pkgs/tools/misc/calamares/supportedlocale.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp
index 2357019a7..75b547430 100644
--- a/src/modules/locale/Config.cpp
+++ b/src/modules/locale/Config.cpp
@@ -48,7 +48,7 @@ loadLocales( const QString& localeGenPath )
// supported locales. We first try that one, and if it doesn't exist, we fall back
// to parsing the lines from locale.gen
localeGenLines.clear();
- QFile supported( "/usr/share/i18n/SUPPORTED" );
+ QFile supported( "/run/current-system/sw/share/i18n/SUPPORTED" );
QByteArray ba;
if ( supported.exists() && supported.open( QIODevice::ReadOnly | QIODevice::Text ) )