gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg: remove references to build platform compiler

Browse Source 
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.
This commit is contained in:
Ben Wolsieffer
2023-02-19 00:21:11 -05:00
parent 2abea38e08
commit 88e8156503
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/ffmpeg/generic.nix
+3 -2
View File
@@ -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 ];