From b5a4db8b5283999fdfb2bc1598a3c85e124ee4d4 Mon Sep 17 00:00:00 2001 From: Jonathan del Strother Date: Thu, 1 Apr 2021 19:15:54 +0100 Subject: libtheora: Fix compilation when MACOSX_DEPLOYMENT_TARGET=11 (#118132) Co-authored-by: Sandro --- pkgs/development/libraries/libtheora/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'pkgs/development/libraries/libtheora') diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 1638150c263..8f0c4d818f4 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libogg, libvorbis, pkg-config}: +{lib, stdenv, fetchurl, libogg, libvorbis, pkg-config, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { name = "libtheora-1.1.1"; @@ -8,18 +8,20 @@ stdenv.mkDerivation rec { sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0"; }; + patches = [ + # fix error in autoconf scripts + (fetchpatch { + url = "https://github.com/xiph/theora/commit/28cc6dbd9b2a141df94f60993256a5fca368fa54.diff"; + sha256 = "16jqrq4h1b3krj609vbpzd5845cvkbh3mwmjrcdg35m490p19x9k"; + }) + ]; + outputs = [ "out" "dev" "devdoc" ]; outputDoc = "devdoc"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; propagatedBuildInputs = [ libogg libvorbis ]; - # GCC's -fforce-addr flag is not supported by clang - # It's just an optimization, so it's safe to simply remove it - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace configure --replace "-fforce-addr" "" - ''; - meta = with lib; { homepage = "https://www.theora.org/"; description = "Library for Theora, a free and open video compression format"; -- cgit 1.4.1