From b3d27652719cb09053b35bb6f51820f7045e6417 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Sat, 15 Jul 2023 17:14:33 -0500 Subject: [PATCH 1/2] rustPlatform.maturinBuildHook: fix postBuild hook to use ./dist contract --- pkgs/build-support/rust/hooks/maturin-build-hook.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh index 41b313280d70..62d5619660c6 100644 --- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -24,8 +24,6 @@ maturinBuildHook() { ${maturinBuildFlags-} ) - runHook postBuild - if [ ! -z "${buildAndTestSubdir-}" ]; then popd fi @@ -34,6 +32,9 @@ maturinBuildHook() { mkdir -p dist mv target/wheels/*.whl dist/ + # These are python build hooks and may depend on ./dist + runHook postBuild + echo "Finished maturinBuildHook" } From 670a15018d8e13af208c1913b48ae250fe7c9ffe Mon Sep 17 00:00:00 2001 From: David Arnold Date: Sun, 16 Jul 2023 16:09:31 -0500 Subject: [PATCH 2/2] matrix-synapse-plugins.matrix-http-rendezvous-synapse: fix maturin hook use --- pkgs/servers/matrix-synapse/plugins/rendezvous.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/servers/matrix-synapse/plugins/rendezvous.nix b/pkgs/servers/matrix-synapse/plugins/rendezvous.nix index fe1f2469ef2d..c15c24681a2c 100644 --- a/pkgs/servers/matrix-synapse/plugins/rendezvous.nix +++ b/pkgs/servers/matrix-synapse/plugins/rendezvous.nix @@ -29,13 +29,8 @@ buildPythonPackage rec { maturinBuildHook ]); - preBuild = '' - cd synapse - ''; + buildAndTestSubdir = "synapse"; - postBuild = '' - cd .. - ''; pythonImportsCheck = [ "matrix_http_rendezvous_synapse" ];