Unverified Commit 1cd921df authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

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
parents 486bd793 2f994a85

pkgs/applications/networking/instant-messengers/qq/default.nix

+2 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
, at-spi2-core

, autoPatchelfHook

, wrapGAppsHook

, makeWrapper

}:



let
@@ -43,7 +42,6 @@ stdenv.mkDerivation { 
  nativeBuildInputs = [

    autoPatchelfHook

    wrapGAppsHook

    makeWrapper

    dpkg

  ];
@@ -52,6 +50,7 @@ stdenv.mkDerivation { 
    at-spi2-core

    cups

    gtk3

    glib

    libdrm

    libgcrypt

    libkrb5
@@ -73,9 +72,7 @@ stdenv.mkDerivation { 
    substituteInPlace $out/share/applications/qq.desktop \

      --replace "/opt/QQ/qq" "$out/bin/qq" \

      --replace "/usr/share" "$out/share"

    makeWrapper $out/opt/QQ/qq $out/bin/qq \

      --argv0 "qq" \

      --prefix GTK_IM_MODULE_FILE : "/run/current-system/sw/etc/gtk-3.0/immodules.cache"

    ln -s $out/opt/QQ/qq $out/bin/qq



    runHook postInstall

  '';