From aa5b3270d16249ff981926a9e9878dbb7a7707f2 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 20 Jun 2025 11:18:12 +0100 Subject: [PATCH] mvfst: use `sanitiseHeaderPathsHook` --- pkgs/by-name/mv/mvfst/package.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index 3b4472c0e11b..d7e11080cd7e 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -6,7 +6,7 @@ cmake, ninja, - removeReferencesTo, + sanitiseHeaderPathsHook, folly, gflags, @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - removeReferencesTo + sanitiseHeaderPathsHook ]; buildInputs = [ @@ -123,21 +123,6 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; - postFixup = '' - # Sanitize header paths to avoid runtime dependencies leaking in - # through `__FILE__`. - ( - shopt -s globstar - for header in "$dev/include"/**/*.h; do - sed -i "1i#line 1 \"$header\"" "$header" - remove-references-to -t "$dev" "$header" - done - ) - - # TODO: Do this in `gtest` rather than downstream. - remove-references-to -t ${gtest.dev} $out/lib/* - ''; - passthru.updateScript = nix-update-script { }; meta = {