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

Revert "ffmpeg: work around ld64 hardening issue"

Browse Source 
The ld64 issue has been fixed.

This reverts commit 05e5a4e279.
This commit is contained in:
Emily
2026-07-15 03:26:25 +01:00
parent 0de2f5816b
commit c336281d85
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/ffmpeg/generic.nix
+7 -17
View File
@@ -366,9 +366,6 @@
libnpp,
# Testing
testers,
# TODO: Clean up on `staging`.
llvmPackages,
}:
/*
@@ -837,9 +834,7 @@ stdenv.mkDerivation (
++ optionals stdenv.hostPlatform.isx86 [ nasm ]
# Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle.
++ optionals (lib.versionAtLeast version "6") [ texinfo ]
++ optionals withCudaNVCC [ cuda_nvcc ]
# TODO: Clean up on `staging`.
++ optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
++ optionals withCudaNVCC [ cuda_nvcc ];
buildInputs =
[ ]
@@ -983,17 +978,12 @@ stdenv.mkDerivation (
buildFlags = [ "all" ] ++ optional buildQtFaststart "tools/qt-faststart"; # Build qt-faststart executable
env =
lib.optionalAttrs stdenv.cc.isGNU {
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=incompatible-pointer-types"
"-Wno-error=int-conversion"
];
}
# TODO: Clean up on `staging`.
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
NIX_CFLAGS_LINK = "-fuse-ld=lld";
};
env = lib.optionalAttrs stdenv.cc.isGNU {
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=incompatible-pointer-types"
"-Wno-error=int-conversion"
];
};
# tests linking broken with shaderc after https://github.com/NixOS/nixpkgs/pull/477464/changes/5a47b12dfcd1b909ba35778a866394430054319a
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform && !withShaderc;