Merge pull request #276968 from eclairevoyant/openbangla

fcitx5-openbangla-keyboard: fix runtime crash

authored by Artturi and committed by GitHub 1ab54f84 fb703565

+11 -7
+11 -7
pkgs/applications/misc/openbangla-keyboard/default.nix
··· 11 , ibus 12 , qtbase 13 , zstd 14 , withFcitx5Support ? false 15 , withIbusSupport ? false 16 }: ··· 28 hash = "sha256-4CR4lgHB51UvS/RLc0AEfIKJ7dyTCOfDrQdGLf9de8E="; 29 fetchSubmodules = true; 30 }; 31 32 nativeBuildInputs = [ 33 cmake ··· 65 cargoRoot = "src/engine/riti"; 66 postPatch = '' 67 cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock 68 - 69 - substituteInPlace CMakeLists.txt \ 70 - --replace "/usr" "$out" 71 - 72 - substituteInPlace src/shared/FileSystem.cpp \ 73 - --replace "/usr" "$out" 74 - ''; 75 76 meta = { 77 isIbusEngine = withIbusSupport;
··· 11 , ibus 12 , qtbase 13 , zstd 14 + , fetchpatch 15 , withFcitx5Support ? false 16 , withIbusSupport ? false 17 }: ··· 29 hash = "sha256-4CR4lgHB51UvS/RLc0AEfIKJ7dyTCOfDrQdGLf9de8E="; 30 fetchSubmodules = true; 31 }; 32 + 33 + patches = [ 34 + # prevents runtime crash when fcitx5-based IM attempts to look in /usr 35 + (fetchpatch { 36 + name = "use-CMAKE_INSTALL_PREFIX-for-loading-data.patch"; 37 + url = "https://github.com/OpenBangla/OpenBangla-Keyboard/commit/f402472780c29eaa6b4cc841a70289adf171462b.diff"; 38 + hash = "sha256-YahvtyOxe8F40Wfe+31C6fdmm197QN26/Q67oinOplk="; 39 + }) 40 + ]; 41 42 nativeBuildInputs = [ 43 cmake ··· 75 cargoRoot = "src/engine/riti"; 76 postPatch = '' 77 cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock 78 + ''; 79 80 meta = { 81 isIbusEngine = withIbusSupport;