diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2019-02-14 10:36:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-14 10:36:33 +0100 |
| commit | 53a73b0914b33407d966575528f5358b90e635b8 (patch) | |
| tree | 2217a8d4a719ca839fa027e243e2285c6185b451 | |
| parent | d55f53d019b26ea0b99bb50b09dd812cdd4e9700 (diff) | |
| parent | ea4431750e1e8537badf76d8bd427951c620df21 (diff) | |
| download | nixpkgs-53a73b0914b33407d966575528f5358b90e635b8.tar nixpkgs-53a73b0914b33407d966575528f5358b90e635b8.tar.gz nixpkgs-53a73b0914b33407d966575528f5358b90e635b8.tar.bz2 nixpkgs-53a73b0914b33407d966575528f5358b90e635b8.tar.lz nixpkgs-53a73b0914b33407d966575528f5358b90e635b8.tar.xz nixpkgs-53a73b0914b33407d966575528f5358b90e635b8.tar.zst nixpkgs-53a73b0914b33407d966575528f5358b90e635b8.zip | |
Merge pull request #55740 from flokli/brasero-libdvdcss
brasero: fix libdvdcss usage
| -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; } |