From 555a908e4321cc8206ba14567a2c26bb7d117da8 Mon Sep 17 00:00:00 2001 From: Reinout Meliesie Date: Sat, 8 Mar 2025 13:53:29 +0100 Subject: [PATCH] Link to individual dependency files in Bookwyrm package This enables dependencies with overlapping directory structures to be merged correctly. --- packages/bookwyrm/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/bookwyrm/package.nix b/packages/bookwyrm/package.nix index e22543b..bb71e8a 100644 --- a/packages/bookwyrm/package.nix +++ b/packages/bookwyrm/package.nix @@ -26,7 +26,7 @@ mkDerivation { dontBuild = true ; installPhase = let - dependencies = [ + pythonDependencies = [ aiohappyeyeballs aiohttp aiosignal @@ -98,9 +98,15 @@ mkDerivation { # Python dependencies - dependencies="${ concatStringsSep " " dependencies }" - for target in $dependencies ; do - ln -sf $target/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ + pythonDependencies="${ concatStringsSep " " pythonDependencies }" + for package in $pythonDependencies ; do + for directory in $( sh -c "cd $package/lib/python3.11/site-packages ; find -type d -not -name __pycache__" ) ; do + mkdir $out/lib/python3.11/site-packages/$directory + done + + for file in $( sh -c "cd $package/lib/python3.11/site-packages ; find -type f" ) ; do + ln -s $package/lib/python3.11/site-packages/$file $out/lib/python3.11/site-packages/$file + done done # Python packages