diff --git a/pkgs/by-name/li/libcangjie/package.nix b/pkgs/by-name/li/libcangjie/package.nix index ab562d9c1999..b9e40ee59d65 100644 --- a/pkgs/by-name/li/libcangjie/package.nix +++ b/pkgs/by-name/li/libcangjie/package.nix @@ -1,36 +1,45 @@ -{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }: +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + sqlite, + cppcheck, +}: stdenv.mkDerivation rec { pname = "libcangjie"; - version = "1.4_rev_${rev}"; - rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d"; + version = "1.4.0"; - # fetchFromGitLab isn't working for some reason - src = fetchurl { - url = "https://gitlab.freedesktop.org/cangjie/libcangjie/-/archive/a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d/libcangjie-a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d.tar.gz"; - sha256 = "sha256-j5IQ0hBefoF8p966YrfZgYCw7ht5twJhYi4l0NneukQ="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "cangjie"; + repo = "libcangjie"; + rev = "v${version}"; + hash = "sha256-LZRU2hbAC8xftPAIHDKCa2SfFLuH/PVqvjZmOSoUQwc="; }; - nativeBuildInputs = [ pkg-config autoconf automake ]; - buildInputs = [ libtool m4 sqlite ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; - configureScript = "./autogen.sh"; - - preConfigure = '' - find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';' - ''; + buildInputs = [ + sqlite + cppcheck + ]; doCheck = true; meta = { description = "C library implementing the Cangjie input method"; - longDescription = '' - libcangjie is a library implementing the Cangjie input method. - ''; homepage = "https://gitlab.freedesktop.org/cangjie/libcangjie"; license = lib.licenses.lgpl3Plus; - maintainers = [ lib.maintainers.linquize ]; platforms = lib.platforms.all; + mainProgram = "libcangjie-cli"; }; }