From 363f75d245666466be8ef172e6d03e872757f4d4 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 20 Jun 2025 11:15:57 +0100 Subject: [PATCH] folly: use `sanitiseHeaderPathsHook` --- pkgs/by-name/fo/folly/package.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 22ba13014094..33f945777718 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -8,7 +8,7 @@ cmake, ninja, pkg-config, - removeReferencesTo, + sanitiseHeaderPathsHook, double-conversion, fast-float, @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { cmake ninja pkg-config - removeReferencesTo + sanitiseHeaderPathsHook ]; # See CMake/folly-deps.cmake in the Folly source tree. @@ -192,18 +192,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 - ) - ''; - passthru = { inherit boost; fmt = fmt_11;