zedfrigg/nix-packages
1
0
Fork 0
Code Issues Pull requests Activity Actions

Handle overlapping Python deps correctly in Bookwyrm build script

Browse source
This commit is contained in:
Reinout Meliesie 2025-03-09 22:05:45 +01:00
parent 7931df4cb9
commit 92001deded
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
packages/bookwyrm/package.nix
View file

@ -57,12 +57,6 @@ let
marshmallow marshmallow
multidict multidict
oauthlib oauthlib
opentelemetry-api
opentelemetry-exporter-otlp-proto-common
opentelemetry-exporter-otlp-proto-grpc
opentelemetry-proto
opentelemetry-sdk
opentelemetry-semantic-conventions
packaging packaging
pilkit pilkit
pillow pillow
@ -88,7 +82,14 @@ let
yarl yarl
] ; ] ;
overlappingPythonDependencies = [] ; overlappingPythonDependencies = [
opentelemetry-api
opentelemetry-exporter-otlp-proto-common
opentelemetry-exporter-otlp-proto-grpc
opentelemetry-proto
opentelemetry-sdk
opentelemetry-semantic-conventions
] ;
in in
mkDerivation { mkDerivation {
@ -108,7 +109,7 @@ mkDerivation {
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
mkdir -p /build/lib/python3.11/site-packages mkdir -p /build/lib/python3.11/site-packages/opentelemetry/exporter/otlp/proto
# Python dependencies # Python dependencies
@ -116,6 +117,14 @@ mkDerivation {
ln -sf $dependency/lib/python3.11/site-packages/* /build/lib/python3.11/site-packages/ ln -sf $dependency/lib/python3.11/site-packages/* /build/lib/python3.11/site-packages/
done 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 PYTHONPATH=/build/lib/python3.11/site-packages
export DOMAIN="" export DOMAIN=""