From 88e81565035fc5be524890bd5a34e02a85b7980e Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 18 Feb 2023 15:21:41 -0500 Subject: [PATCH] ffmpeg: remove references to build platform compiler When cross-compiling, the build platform compiler ends up in the runtime closure because it is included in the configure flags that get embedded in the binaries. To fix this, add the compiler to the remove-references-to invocation. --- pkgs/development/libraries/ffmpeg/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index d0374c74901e..9a310a32285e 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -526,9 +526,10 @@ stdenv.mkDerivation (finalAttrs: { # outputs where we don't want them. Patch the generated config.h to remove all # such references except for data. postConfigure = let - toStrip = lib.remove "data" finalAttrs.outputs; # We want to keep references to the data dir. + toStrip = map placeholder (lib.remove "data" finalAttrs.outputs) # We want to keep references to the data dir. + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.stdenv.cc; in - "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${placeholder o}") toStrip)} config.h"; + "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${o}") toStrip)} config.h"; nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ];