From e94c67084c1bc7e2e9b89ab051a63dc6a155f32f Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Sat, 27 Aug 2022 19:15:59 +0200 Subject: [PATCH] libbluray: backport bugfix --- pkgs/development/libraries/libbluray/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 8217d42f0d9a..f987e7c6497f 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, fontconfig, autoreconfHook, DiskArbitration , withJava ? false, jdk, ant , withAACS ? false, libaacs , withBDplus ? false, libbdplus @@ -20,6 +20,16 @@ stdenv.mkDerivation rec { patches = [ ./BDJ-JARFILE-path.patch + (fetchpatch { + name = "Initial-support-for-Java-18.patch"; + url = "https://code.videolan.org/videolan/libbluray/-/commit/3187c3080096e107f0a27eed1843232b58342577.patch"; + hash = "sha256-2TSciAoPzELkgmFGB38h1RgynOCJueyCL8hIADxAPHo="; + }) + (fetchpatch { + name = "bd-j-BDJSecurityManager-Change-setSecurityManager-de.patch"; + url = "https://code.videolan.org/videolan/libbluray/-/commit/9a2d23d049760ef9cc9661ff90011a84d90368f1.patch"; + hash = "sha256-xCc2h5ocXCqnpVMPQaybT2Ncs2YOzifQ0mlCCUhYlc8="; + }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]