From 034f0298f4ffe3eef43eca2a2b848302031525e6 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 20 Jun 2025 11:20:54 +0100 Subject: [PATCH] edencommon: use `sanitiseHeaderPathsHook` --- pkgs/by-name/ed/edencommon/package.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index eb0a3e823440..69f00ab94a52 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -6,7 +6,7 @@ cmake, ninja, - removeReferencesTo, + sanitiseHeaderPathsHook, glog, gflags, @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - removeReferencesTo + sanitiseHeaderPathsHook ]; buildInputs = [ @@ -98,18 +98,6 @@ stdenv.mkDerivation (finalAttrs: { 'find_package(FBThrift CONFIG REQUIRED COMPONENTS cpp2)' ''; - 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.updateScript = nix-update-script { }; meta = {