Merge pull request #276968 from eclairevoyant/openbangla

fcitx5-openbangla-keyboard: fix runtime crash
This commit is contained in:
Artturi 2024-02-10 13:52:42 +02:00 committed by GitHub
commit 1ab54f84dc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -11,6 +11,7 @@
, ibus
, qtbase
, zstd
, fetchpatch
, withFcitx5Support ? false
, withIbusSupport ? false
}:
@ -29,6 +30,15 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
# prevents runtime crash when fcitx5-based IM attempts to look in /usr
(fetchpatch {
name = "use-CMAKE_INSTALL_PREFIX-for-loading-data.patch";
url = "https://github.com/OpenBangla/OpenBangla-Keyboard/commit/f402472780c29eaa6b4cc841a70289adf171462b.diff";
hash = "sha256-YahvtyOxe8F40Wfe+31C6fdmm197QN26/Q67oinOplk=";
})
];
nativeBuildInputs = [
cmake
pkg-config
@ -65,13 +75,7 @@ stdenv.mkDerivation rec {
cargoRoot = "src/engine/riti";
postPatch = ''
cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock
substituteInPlace CMakeLists.txt \
--replace "/usr" "$out"
substituteInPlace src/shared/FileSystem.cpp \
--replace "/usr" "$out"
'';
'';
meta = {
isIbusEngine = withIbusSupport;