From 369b49c104c2e281a08a3d992e613460f56ff7b4 Mon Sep 17 00:00:00 2001 From: Jack Wilsdon Date: Tue, 15 Jul 2025 01:01:36 +0100 Subject: [PATCH] libedgetpu: fix building with Abseil 20250512.0 Abseil 20250512.0 removed the bad_optional_access library. --- .../li/libedgetpu/fix-abseil-20250512.0.patch | 12 ++++++++++++ pkgs/by-name/li/libedgetpu/package.nix | 1 + 2 files changed, 13 insertions(+) create mode 100644 pkgs/by-name/li/libedgetpu/fix-abseil-20250512.0.patch diff --git a/pkgs/by-name/li/libedgetpu/fix-abseil-20250512.0.patch b/pkgs/by-name/li/libedgetpu/fix-abseil-20250512.0.patch new file mode 100644 index 000000000000..856ac801cc8e --- /dev/null +++ b/pkgs/by-name/li/libedgetpu/fix-abseil-20250512.0.patch @@ -0,0 +1,12 @@ +diff --git a/makefile_build/Makefile b/makefile_build/Makefile +index 335e74a..71492d0 100644 +--- a/makefile_build/Makefile ++++ b/makefile_build/Makefile +@@ -40,7 +40,6 @@ LIBEDGETPU_LDFLAGS := \ + -labsl_hashtablez_sampler \ + -labsl_raw_hash_set \ + -labsl_str_format_internal \ +- -labsl_bad_optional_access \ + -lusb-1.0 + + LIBEDGETPU_FLATC_SRCS := \ diff --git a/pkgs/by-name/li/libedgetpu/package.nix b/pkgs/by-name/li/libedgetpu/package.nix index 86679e8bb7c5..ef4e2368ea42 100644 --- a/pkgs/by-name/li/libedgetpu/package.nix +++ b/pkgs/by-name/li/libedgetpu/package.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation { url = "https://patch-diff.githubusercontent.com/raw/google-coral/libedgetpu/pull/66.patch"; hash = "sha256-mMODpQmikfXtsQvtgh26cy97EiykYNLngSjidOBt/3I="; }) + ./fix-abseil-20250512.0.patch ]; postPatch = ''