diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-02-15 09:26:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-15 09:26:41 -0500 |
| commit | 74cda3f0c208bc590540279703747e9703f2942a (patch) | |
| tree | bdea7ac3c0fe104bfa1f827e6a18c80a85bf4865 | |
| parent | Merge pull request #288005 from NixOS/backport-287815-to-release-23.11 (diff) | |
| parent | fcitx5-openbangla-keyboard: fix runtime crash (diff) | |
| download | nixpkgs-74cda3f0c208bc590540279703747e9703f2942a.tar.gz | |
Merge pull request #287745 from NixOS/backport-276968-to-release-23.11
[Backport release-23.11] fcitx5-openbangla-keyboard: fix runtime crash
| -rw-r--r-- | pkgs/applications/misc/openbangla-keyboard/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix index c0a514367af9..4b7e1ec8c16a 100644 --- a/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -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; |