From ea4431750e1e8537badf76d8bd427951c620df21 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 14 Feb 2019 01:14:55 +0100 Subject: [PATCH] brasero: fix libdvdcss usage turns out, prefixing LD_PRELOAD with the path to libdvdcss works just fine. --- pkgs/tools/cd-dvd/brasero/default.nix | 2 -- pkgs/tools/cd-dvd/brasero/wrapper.nix | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index 753bdd49959c..402073ff5241 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -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"; diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix index 7f97209a4aa9..8112b0971f3d 100644 --- a/pkgs/tools/cd-dvd/brasero/wrapper.nix +++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix @@ -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; }