Merge pull request #177374 from dali99/libaom-pbi
Fix staging build for `gst_all_1.gst-plugins-bad`
This commit is contained in:
commit
6614d56407
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3
|
||||
, enableButteraugli ? false, libjxl, libhwy # Broken
|
||||
, enableButteraugli ? false, libjxl # Broken
|
||||
, enableVmaf ? true, libvmaf
|
||||
}:
|
||||
|
||||
|
@ -19,10 +19,8 @@ stdenv.mkDerivation rec {
|
|||
yasm perl cmake pkg-config python3
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals enableButteraugli [
|
||||
libjxl
|
||||
libhwy
|
||||
] ++ lib.optional enableVmaf libvmaf;
|
||||
propagatedBuildInputs = lib.optional enableButteraugli libjxl
|
||||
++ lib.optional enableVmaf libvmaf;
|
||||
|
||||
preConfigure = ''
|
||||
# build uses `git describe` to set the build version
|
||||
|
|
|
@ -78,10 +78,8 @@ stdenv.mkDerivation rec {
|
|||
# conclusively in its README or otherwise; they can best be determined
|
||||
# by checking the CMake output for "Could NOT find".
|
||||
buildInputs = [
|
||||
brotli
|
||||
giflib
|
||||
gperftools # provides `libtcmalloc`
|
||||
libhwy
|
||||
libjpeg
|
||||
libpng
|
||||
libwebp
|
||||
|
@ -89,6 +87,11 @@ stdenv.mkDerivation rec {
|
|||
zlib
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
brotli
|
||||
libhwy
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# For C dependencies like brotli, which are dynamically linked,
|
||||
# we want to use the system libraries, so that we don't have to care about
|
||||
|
|
Loading…
Reference in a new issue