From 2ab1319135b33a260382aaa0fb1af36ae64b2da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 18 Jun 2025 16:11:33 +0200 Subject: [PATCH] onboard: patch custom bool redefinition https://hydra.nixos.org/build/300403196/nixlog/1/tail Perhaps we should also look at phasing out this package and/or https://github.com/dr-ni/onboard --- pkgs/by-name/on/onboard/bool.patch | 10 ++++++++++ pkgs/by-name/on/onboard/package.nix | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/by-name/on/onboard/bool.patch diff --git a/pkgs/by-name/on/onboard/bool.patch b/pkgs/by-name/on/onboard/bool.patch new file mode 100644 index 000000000000..21fa96325b5c --- /dev/null +++ b/pkgs/by-name/on/onboard/bool.patch @@ -0,0 +1,10 @@ +Author: @vcunat + + Don't redefine bool and use the standard one instead. + +--- a/Onboard/osk/osk_module.h ++++ b/Onboard/osk/osk_module.h +@@ -28 +28 @@ +-typedef enum { false, true } bool; ++#include + diff --git a/pkgs/by-name/on/onboard/package.nix b/pkgs/by-name/on/onboard/package.nix index 7a2e35306d84..804c89170235 100644 --- a/pkgs/by-name/on/onboard/package.nix +++ b/pkgs/by-name/on/onboard/package.nix @@ -72,6 +72,8 @@ python3.pkgs.buildPythonApplication rec { url = "https://github.com/void-linux/void-packages/raw/9ef46bf26ac5acc1af5809f11c97b19c5e2233ed/srcpkgs/onboard/patches/fix-brokenformat.patch"; hash = "sha256-r9mvJNWpPR1gsayuSSLpzIuafEKqtADYklre0Ju+KOM="; }) + + ./bool.patch ]; nativeBuildInputs = [