From 4b919a5b81789f7f5a49bf83d05174b75b719742 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 27 Aug 2023 07:56:50 +0200 Subject: gerbera: fix build with fmt-10.1 --- pkgs/servers/gerbera/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'pkgs/servers/gerbera') diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index b62237866b3f2..9cd7cadc09eec 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , nixosTests @@ -74,6 +75,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-j5J0u0zIjHY2kP5P8IzN2h+QQSCwsel/iTspad6V48s="; }; + patches = [ + # Can be removed on the next bump, see: + # https://github.com/gerbera/gerbera/pull/2840. + (fetchpatch { + name = "gerbera-fmt10.patch"; + url = "https://github.com/gerbera/gerbera/commit/37957aac0aea776e6f843af2358916f81056a405.patch"; + hash = "sha256-U7dyFGEbelVZeHYX/4fLOC0k+9pUKZ8qP/LIVXWCMcU="; + }) + ]; + postPatch = lib.optionalString enableMysql '' substituteInPlace cmake/FindMySQL.cmake \ --replace /usr/include/mysql ${lib.getDev libmysqlclient}/include/mariadb \ -- cgit 1.4.1