From 92001deded625d6c3c350d3a81218f0a53eb3658 Mon Sep 17 00:00:00 2001
From: Reinout Meliesie <zedfrigg@kernelmaft.com>
Date: Sun, 9 Mar 2025 22:05:45 +0100
Subject: [PATCH] Handle overlapping Python deps correctly in Bookwyrm build
 script

---
 packages/bookwyrm/package.nix | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/packages/bookwyrm/package.nix b/packages/bookwyrm/package.nix
index 816e112..ec5cb1d 100644
--- a/packages/bookwyrm/package.nix
+++ b/packages/bookwyrm/package.nix
@@ -57,12 +57,6 @@ let
 		marshmallow
 		multidict
 		oauthlib
-		opentelemetry-api
-		opentelemetry-exporter-otlp-proto-common
-		opentelemetry-exporter-otlp-proto-grpc
-		opentelemetry-proto
-		opentelemetry-sdk
-		opentelemetry-semantic-conventions
 		packaging
 		pilkit
 		pillow
@@ -88,7 +82,14 @@ let
 		yarl
 	] ;
 
-	overlappingPythonDependencies = [] ;
+	overlappingPythonDependencies = [
+		opentelemetry-api
+		opentelemetry-exporter-otlp-proto-common
+		opentelemetry-exporter-otlp-proto-grpc
+		opentelemetry-proto
+		opentelemetry-sdk
+		opentelemetry-semantic-conventions
+	] ;
 in 
 
 mkDerivation {
@@ -108,7 +109,7 @@ mkDerivation {
 	buildPhase = ''
 		runHook preBuild
 
-		mkdir -p /build/lib/python3.11/site-packages
+		mkdir -p /build/lib/python3.11/site-packages/opentelemetry/exporter/otlp/proto
 
 		# Python dependencies
 
@@ -116,6 +117,14 @@ mkDerivation {
 			ln -sf $dependency/lib/python3.11/site-packages/* /build/lib/python3.11/site-packages/
 		done
 
+		ln -s ${opentelemetry-api}/lib/python3.11/site-packages/opentelemetry/* /build/lib/python3.11/site-packages/opentelemetry/
+		ln -s ${opentelemetry-proto}/lib/python3.11/site-packages/opentelemetry/* /build/lib/python3.11/site-packages/opentelemetry/
+		ln -s ${opentelemetry-sdk}/lib/python3.11/site-packages/opentelemetry/* /build/lib/python3.11/site-packages/opentelemetry/
+		ln -s ${opentelemetry-semantic-conventions}/lib/python3.11/site-packages/opentelemetry/* /build/lib/python3.11/site-packages/opentelemetry/
+
+		ln -s ${opentelemetry-exporter-otlp-proto-common}/lib/python3.11/site-packages/opentelemetry/exporter/otlp/proto/* /build/lib/python3.11/site-packages/opentelemetry/exporter/otlp/proto/
+		ln -s ${opentelemetry-exporter-otlp-proto-grpc}/lib/python3.11/site-packages/opentelemetry/exporter/otlp/proto/* /build/lib/python3.11/site-packages/opentelemetry/exporter/otlp/proto/
+
 		export PYTHONPATH=/build/lib/python3.11/site-packages
 
 		export DOMAIN=""