diff --git a/packages/bookwyrm/package.nix b/packages/bookwyrm/package.nix index 6b0c9fa..e67ac92 100644 --- a/packages/bookwyrm/package.nix +++ b/packages/bookwyrm/package.nix @@ -83,12 +83,12 @@ let ] ; overlappingPythonDependencies = [ - opentelemetry-api - opentelemetry-exporter-otlp-proto-common - opentelemetry-exporter-otlp-proto-grpc - opentelemetry-proto - opentelemetry-sdk - opentelemetry-semantic-conventions + { package = opentelemetry-api ; subDirectory = "opentelemetry" ; } + { package = opentelemetry-exporter-otlp-proto-common ; subDirectory = "opentelemetry/exporter/otlp/proto" ; } + { package = opentelemetry-exporter-otlp-proto-grpc ; subDirectory = "opentelemetry/exporter/otlp/proto" ; } + { package = opentelemetry-proto ; subDirectory = "opentelemetry" ; } + { package = opentelemetry-sdk ; subDirectory = "opentelemetry" ; } + { package = opentelemetry-semantic-conventions ; subDirectory = "opentelemetry" ; } ] ; in @@ -117,13 +117,10 @@ 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/ + ${ concatStringsSep "\n" ( map ( dependency : '' + ln -s ${ dependency . package }/lib/python3.11/site-packages/${ dependency . subDirectory }/* \ + /build/lib/python3.11/site-packages/${ dependency . subDirectory }/ + '' ) overlappingPythonDependencies ) } export PYTHONPATH=/build/lib/python3.11/site-packages @@ -154,6 +151,11 @@ mkDerivation { ln -sf $dependency/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ done + ${ concatStringsSep "\n" ( map ( dependency : '' + ln -s ${ dependency . package }/lib/python3.11/site-packages/${ dependency . subDirectory }/* \ + /build/lib/python3.11/site-packages/${ dependency . subDirectory }/ + '' ) overlappingPythonDependencies ) } + # Python packages cp -r $src/bookwyrm $out/lib/python3.11/site-packages/