Merge pull request #211190 from LostAttractor/qq-notprefix

qq: remove GTK_IM_MODULE_FILE prefix and add glib to buildInputs to fix input-method not works
This commit is contained in:
Nick Cao 2023-01-18 09:06:37 +08:00 committed by GitHub
commit 1cd921df1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -17,7 +17,6 @@
, at-spi2-core , at-spi2-core
, autoPatchelfHook , autoPatchelfHook
, wrapGAppsHook , wrapGAppsHook
, makeWrapper
}: }:
let let
@ -43,7 +42,6 @@ stdenv.mkDerivation {
nativeBuildInputs = [ nativeBuildInputs = [
autoPatchelfHook autoPatchelfHook
wrapGAppsHook wrapGAppsHook
makeWrapper
dpkg dpkg
]; ];
@ -52,6 +50,7 @@ stdenv.mkDerivation {
at-spi2-core at-spi2-core
cups cups
gtk3 gtk3
glib
libdrm libdrm
libgcrypt libgcrypt
libkrb5 libkrb5
@ -73,9 +72,7 @@ stdenv.mkDerivation {
substituteInPlace $out/share/applications/qq.desktop \ substituteInPlace $out/share/applications/qq.desktop \
--replace "/opt/QQ/qq" "$out/bin/qq" \ --replace "/opt/QQ/qq" "$out/bin/qq" \
--replace "/usr/share" "$out/share" --replace "/usr/share" "$out/share"
makeWrapper $out/opt/QQ/qq $out/bin/qq \ ln -s $out/opt/QQ/qq $out/bin/qq
--argv0 "qq" \
--prefix GTK_IM_MODULE_FILE : "/run/current-system/sw/etc/gtk-3.0/immodules.cache"
runHook postInstall runHook postInstall
''; '';