diff options
| author | Florian Klink <flokli@flokli.de> | 2019-02-14 01:14:55 +0100 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2019-02-14 01:20:41 +0100 |
| commit | ea4431750e1e8537badf76d8bd427951c620df21 (patch) | |
| tree | 4fd581536bb01bf8f87934af07379d9039ae262e /pkgs/tools/cd-dvd | |
| parent | ac29d96d25ac361a083a27f2f4a57f52d2817c20 (diff) | |
| download | nixpkgs-ea4431750e1e8537badf76d8bd427951c620df21.tar nixpkgs-ea4431750e1e8537badf76d8bd427951c620df21.tar.gz nixpkgs-ea4431750e1e8537badf76d8bd427951c620df21.tar.bz2 nixpkgs-ea4431750e1e8537badf76d8bd427951c620df21.tar.lz nixpkgs-ea4431750e1e8537badf76d8bd427951c620df21.tar.xz nixpkgs-ea4431750e1e8537badf76d8bd427951c620df21.tar.zst nixpkgs-ea4431750e1e8537badf76d8bd427951c620df21.zip | |
brasero: fix libdvdcss usage
turns out, prefixing LD_PRELOAD with the path to libdvdcss works just fine.
Diffstat (limited to 'pkgs/tools/cd-dvd')
| -rw-r--r-- | pkgs/tools/cd-dvd/brasero/default.nix | 2 | ||||
| -rw-r--r-- | 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 753bdd49959..402073ff524 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 7f97209a4aa..8112b0971f3 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; } |