diff --git a/pkgs/by-name/bi/bicon/package.nix b/pkgs/by-name/bi/bicon/package.nix index d5055459e2d1..62a0a8db3b6e 100644 --- a/pkgs/by-name/bi/bicon/package.nix +++ b/pkgs/by-name/bi/bicon/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, autoreconfHook, pkg-config, perl, @@ -11,27 +10,17 @@ xkbutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bicon"; - version = "unstable-2020-06-04"; + version = "0.5-unstable-2024-01-31"; src = fetchFromGitHub { owner = "behdad"; - repo = pname; - rev = "64ae10c94b94a573735a2c2b1502334b86d3b1f7"; - sha256 = "0ixsf65j4dbdl2aazjc2j0hiagbp6svvfwfmyivha0i1k5yx12v1"; + repo = "bicon"; + rev = "48720c0f22197d4d5f7b0f5162a3d8f071e6e8a8"; + hash = "sha256-4pvI4T+fdgCirHDc0h3vP5AZyqfnBKv5R3fJICnpmF4="; }; - patches = [ - # Fix build on clang-13. Pull the change pending upstream - # inclusion: https://github.com/behdad/bicon/pull/29 - (fetchpatch { - name = "clang.patch"; - url = "https://github.com/behdad/bicon/commit/20f5a79571f222f96e07d7c0c5e76e2c9ff1c59a.patch"; - sha256 = "0l1dm7w52k57nv3lvz5pkbwp021mlsk3csyalxi90np1lx5sqbd1"; - }) - ]; - buildInputs = [ fribidi kbd @@ -47,15 +36,15 @@ stdenv.mkDerivation rec { patchShebangs . ''; - meta = with lib; { + meta = { description = "Bidirectional console"; homepage = "https://github.com/behdad/bicon"; - license = [ - licenses.lgpl21 - licenses.psfl - licenses.bsd0 + license = with lib.licenses; [ + lgpl21 + psfl + bsd0 ]; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +})