lol

Merge pull request #243859 from blaggacao/fix-maturin-hook-with-python-hooks

authored by

figsoda and committed by
GitHub
14da6bed c39948ee

+4 -8
+3 -2
pkgs/build-support/rust/hooks/maturin-build-hook.sh
··· 24 ${maturinBuildFlags-} 25 ) 26 27 - runHook postBuild 28 - 29 if [ ! -z "${buildAndTestSubdir-}" ]; then 30 popd 31 fi ··· 33 # Move the wheel to dist/ so that regular Python tooling can find it. 34 mkdir -p dist 35 mv target/wheels/*.whl dist/ 36 37 echo "Finished maturinBuildHook" 38 }
··· 24 ${maturinBuildFlags-} 25 ) 26 27 if [ ! -z "${buildAndTestSubdir-}" ]; then 28 popd 29 fi ··· 31 # Move the wheel to dist/ so that regular Python tooling can find it. 32 mkdir -p dist 33 mv target/wheels/*.whl dist/ 34 + 35 + # These are python build hooks and may depend on ./dist 36 + runHook postBuild 37 38 echo "Finished maturinBuildHook" 39 }
+1 -6
pkgs/servers/matrix-synapse/plugins/rendezvous.nix
··· 29 maturinBuildHook 30 ]); 31 32 - preBuild = '' 33 - cd synapse 34 - ''; 35 36 - postBuild = '' 37 - cd .. 38 - ''; 39 40 pythonImportsCheck = [ "matrix_http_rendezvous_synapse" ]; 41
··· 29 maturinBuildHook 30 ]); 31 32 + buildAndTestSubdir = "synapse"; 33 34 35 pythonImportsCheck = [ "matrix_http_rendezvous_synapse" ]; 36