diff options
| author | xrelkd <46590321+xrelkd@users.noreply.github.com> | 2019-07-13 01:30:33 +0800 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-23 14:20:35 -0400 |
| commit | a354cbb7156bb19f4c9da801ec6c90255ff9e0dc (patch) | |
| tree | 39daa90e4e80f672fb61885285e7c597820197d2 /pkgs/tools | |
| parent | 356d9ad758b75674108cb0fbe22238acf260816d (diff) | |
| download | nixpkgs-a354cbb7156bb19f4c9da801ec6c90255ff9e0dc.tar nixpkgs-a354cbb7156bb19f4c9da801ec6c90255ff9e0dc.tar.gz nixpkgs-a354cbb7156bb19f4c9da801ec6c90255ff9e0dc.tar.bz2 nixpkgs-a354cbb7156bb19f4c9da801ec6c90255ff9e0dc.tar.lz nixpkgs-a354cbb7156bb19f4c9da801ec6c90255ff9e0dc.tar.xz nixpkgs-a354cbb7156bb19f4c9da801ec6c90255ff9e0dc.tar.zst nixpkgs-a354cbb7156bb19f4c9da801ec6c90255ff9e0dc.zip | |
fcitx-qt5: 1.2.1 -> 1.2.3
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index 166fd16811a..b371edb1ace 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -1,25 +1,16 @@ -{ stdenv, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules -, fetchpatch -}: +{ stdenv, fetchFromGitLab, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }: stdenv.mkDerivation rec { - name = "fcitx-qt5-${version}"; - version = "1.2.1"; - - src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-qt5/${name}.tar.xz"; - sha256 = "0z8ax0dxk88byic41mfaiahjdv1k8ciwn97xfjkkgr4ijgscdr8c"; + pname = "fcitx-qt5"; + version = "1.2.3"; + + src = fetchFromGitLab { + owner = "fcitx"; + repo = pname; + rev = version; + sha256 = "0860v3rxsh054wkkbawvyin5mk0flp4cwfcpmcpq147lvdm5lq2i"; }; - patches = [ - # Fix build with Qt 5.11 - # https://github.com/fcitx/fcitx-qt5/issues/34 - (fetchpatch { - url = https://github.com/fcitx/fcitx-qt5/commit/af033e3d5305108eecc568adff7f8b2da5831ed6.diff; - sha256 = "14vfz1fw2k362wnqpglw766fg3d3mc8cmfgic2p96yyipjh9xx3b"; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; buildInputs = [ fcitx qtbase ]; @@ -32,11 +23,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/fcitx/fcitx-qt5; + homepage = https://gitlab.com/fcitx/fcitx-qt5; description = "Qt5 IM Module for Fcitx"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; }; - } |