Merge pull request #55740 from flokli/brasero-libdvdcss

brasero: fix libdvdcss usage
This commit is contained in:
Pascal Wittmann 2019-02-14 10:36:33 +01:00 committed by GitHub
commit 53a73b0914
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions

View File

@ -2,8 +2,6 @@
, libcanberra-gtk3, intltool, dvdauthor, libburn, libisofs
, vcdimager, wrapGAppsHook, hicolor-icon-theme }:
# libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590
let
major = "3.12";
minor = "2";

View File

@ -1,4 +1,4 @@
{ lib, symlinkJoin, brasero-original, cdrtools, makeWrapper }:
{ lib, symlinkJoin, brasero-original, cdrtools, libdvdcss, makeWrapper }:
let
binPath = lib.makeBinPath [ cdrtools ];
@ -10,8 +10,9 @@ in symlinkJoin {
postBuild = ''
wrapProgram $out/bin/brasero \
--prefix PATH ':' ${binPath}
--prefix PATH ':' ${binPath} \
--prefix LD_PRELOAD : ${lib.makeLibraryPath [ libdvdcss ]}/libdvdcss.so
'';
inherit (brasero-original) meta;
}