Unverified Commit 4a9d25e6 authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

{,fcitx5-}openbangla-keyboard: migrate to by-name, preserve overrides (#508973)

parents 86bc1764 6c2d1cec
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
{
  openbangla-keyboard,
  ...
}@args:

openbangla-keyboard.override (
  {
    withFcitx5Support = true;
    withIbusSupport = false;
  }
  // removeAttrs args [ "openbangla-keyboard" ]
)
+7 −5
Original line number Diff line number Diff line
@@ -7,19 +7,21 @@
  pkg-config,
  rustPlatform,
  rustc,
  wrapQtAppsHook,
  fcitx5,
  ibus,
  qtbase,
  libsForQt5,
  zstd,
  withFcitx5Support ? false,
  withIbusSupport ? false,
  withIbusSupport ? true,
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "openbangla-keyboard";
  version = "2.0.0-unstable-2025-08-19";

  __structuredAttrs = true;
  strictDeps = true;

  src = fetchFromGitHub {
    owner = "openbangla";
    repo = "openbangla-keyboard";
@@ -34,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
    cargo
    rustc
    rustPlatform.cargoSetupHook
    wrapQtAppsHook
    libsForQt5.wrapQtAppsHook
  ];

  buildInputs =
@@ -45,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
      ibus
    ]
    ++ [
      qtbase
      libsForQt5.qtbase
      zstd
    ];

+0 −8
Original line number Diff line number Diff line
@@ -2042,10 +2042,6 @@ with pkgs;
    mozc = mozc.override { withIbus = true; };
    mozc-ut = mozc-ut.override { withIbus = true; };

    openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard {
      withIbusSupport = true;
    };

    pinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-pinyin { };

    rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { };
@@ -2276,10 +2272,6 @@ with pkgs;

  fcitx5-m17n = callPackage ../tools/inputmethods/fcitx5/fcitx5-m17n.nix { };

  fcitx5-openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard {
    withFcitx5Support = true;
  };

  fcitx5-gtk = callPackage ../tools/inputmethods/fcitx5/fcitx5-gtk.nix { };

  fcitx5-hangul = callPackage ../tools/inputmethods/fcitx5/fcitx5-hangul.nix { };