From ddd1e56610607ceec26054fee2afb8421678b1c3 Mon Sep 17 00:00:00 2001 From: MidAutumnMoon Date: Sat, 19 Nov 2022 12:06:58 +0800 Subject: [PATCH] libyuv: fix libyuv.so not linking against libjpeg --- pkgs/development/libraries/libyuv/default.nix | 4 +++- .../libyuv/link-library-against-libjpeg.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch diff --git a/pkgs/development/libraries/libyuv/default.nix b/pkgs/development/libraries/libyuv/default.nix index d0d692ed9815..f4415b51f810 100644 --- a/pkgs/development/libraries/libyuv/default.nix +++ b/pkgs/development/libraries/libyuv/default.nix @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg ]; - NIX_CFLAGS_LINK = lib.optional stdenv.isDarwin "-ljpeg"; + patches = [ + ./link-library-against-libjpeg.patch + ]; meta = with lib; { homepage = "https://chromium.googlesource.com/libyuv/libyuv"; diff --git a/pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch b/pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch new file mode 100644 index 000000000000..d0f3d2968462 --- /dev/null +++ b/pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch @@ -0,0 +1,11 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 636531ee..af1b0e4e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,6 +39,7 @@ INCLUDE ( FindJPEG ) + if (JPEG_FOUND) + include_directories( ${JPEG_INCLUDE_DIR} ) + target_link_libraries( yuvconvert ${JPEG_LIBRARY} ) ++ target_link_libraries( ${ly_lib_shared} ${JPEG_LIBRARY} ) + add_definitions( -DHAVE_JPEG ) + endif()