mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-28 19:00:46 +00:00
libaom: 3.14.1 -> 3.15.0
https://aomedia.googlesource.com/aom/+/refs/tags/v3.15.0 Fixes: CVE-2026-56209 CVE-2026-13906
This commit is contained in:
@@ -23,25 +23,16 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libaom";
|
||||
version = "3.14.1";
|
||||
version = "3.15.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://aomedia.googlesource.com/aom/+archive/v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-ddMrDkWV5jUbpPGKsMQl7s4r43205WbBtCEYtZNgwAM=";
|
||||
hash = "sha256-TixZQP06TEZPtpHvWVOEagzHtXW9hqXWweO2yimBDG4=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./outputs.patch
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
# This patch defines `_POSIX_C_SOURCE`, which breaks system headers
|
||||
# on Darwin.
|
||||
(fetchurl {
|
||||
name = "musl.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libaom/files/libaom-3.4.0-posix-c-source-ftello.patch?id=50c7c4021e347ee549164595280cf8a23c960959";
|
||||
hash = "sha256-6+u7GTxZcSNJgN7D+s+XAVwbMnULufkTcQ0s7l+Ydl0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -54,11 +45,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
propagatedBuildInputs = lib.optional enableVmaf libvmaf;
|
||||
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isFreeBSD {
|
||||
# This can be removed when we switch to libcxx from llvm 20
|
||||
# https://github.com/llvm/llvm-project/pull/122361
|
||||
NIX_CFLAGS_COMPILE = "-D_XOPEN_SOURCE=700";
|
||||
};
|
||||
env =
|
||||
lib.optionalAttrs stdenv.hostPlatform.isFreeBSD {
|
||||
# This can be removed when we switch to libcxx from llvm 20
|
||||
# https://github.com/llvm/llvm-project/pull/122361
|
||||
NIX_CFLAGS_COMPILE = "-D_XOPEN_SOURCE=700";
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||
# _POSIX_C_SOURCE breaks system headers on Darwin; it's required on musl
|
||||
NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE=200112L";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
# build uses `git describe` to set the build version
|
||||
|
||||
Reference in New Issue
Block a user