mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
fcitx5-lua: switch to finalAttrs, hardcode pname, move lua5_3 out of top-level
Assisted-by: Cursor Composer 2.5 fcitx5-lua: migrate to by-name Assisted-by: Cursor Composer 2.5
This commit is contained in:
parent
d22bca9412
commit
a552f494b9
2 changed files with 12 additions and 7 deletions
|
|
@ -6,17 +6,24 @@
|
|||
pkg-config,
|
||||
kdePackages,
|
||||
fcitx5,
|
||||
lua,
|
||||
lua5_3,
|
||||
gettext,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
let
|
||||
lua = lua5_3;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fcitx5-lua";
|
||||
version = "5.0.16";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
repo = "fcitx5-lua";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-df0BjORGT+zx/8kg/nGPDa9MBAXpPtdfx8S5O+E31wE=";
|
||||
};
|
||||
|
||||
|
|
@ -43,4 +50,4 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with lib.maintainers; [ poscat ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
@ -2159,8 +2159,6 @@ with pkgs;
|
|||
|
||||
Fabric = with python3Packages; toPythonApplication fabric;
|
||||
|
||||
fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { lua = lua5_3; };
|
||||
|
||||
flatpak-builder = callPackage ../development/tools/flatpak-builder {
|
||||
binutils = binutils-unwrapped;
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue