From 08973610476c8b41bc0023ba95c181ed413a7886 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 14 Nov 2024 13:24:16 +0000 Subject: [PATCH] watchman: strip references to `folly.fmt.dev` (cherry picked from commit 9a90e1cd80359c9dd5e7eaca80274ba9c96b5180) (cherry picked from commit 56788e08aa9ef05fef73ea331555ed7177b00b33) --- pkgs/by-name/wa/watchman/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 683024e61488..29a0eb12767e 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -12,6 +12,7 @@ cargo, rustPlatform, ensureNewerSourcesForZipFilesHook, + removeReferencesTo, pcre2, openssl, @@ -52,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { cargo rustPlatform.cargoSetupHook ensureNewerSourcesForZipFilesHook + removeReferencesTo ]; buildInputs = @@ -98,6 +100,11 @@ stdenv.mkDerivation (finalAttrs: { cp ${./Cargo.lock} ${finalAttrs.cargoRoot}/Cargo.lock ''; + postFixup = '' + # TODO: Do this in `fmt` rather than downstream. + remove-references-to -t ${folly.fmt.dev} $out/bin/* + ''; + meta = { description = "Watches files and takes action when they change"; homepage = "https://facebook.github.io/watchman";