diff options
author | Jörg Thalheim <joerg@higgsboson.tk> | 2016-10-09 21:32:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-09 21:32:32 +0200 |
commit | bb983fbfba8a4e04dd2dbcc551b82f4e98c685d8 (patch) | |
tree | 585c7bce1ac202a7b5c4443ea124e922105f2d5f /pkgs/applications/video | |
parent | c40b3e55e749d253a7e8ede5712121307f72e4ca (diff) | |
parent | dd482470c4756e87dc986655cdbe1467b13ce2bd (diff) | |
download | nixlib-bb983fbfba8a4e04dd2dbcc551b82f4e98c685d8.tar nixlib-bb983fbfba8a4e04dd2dbcc551b82f4e98c685d8.tar.gz nixlib-bb983fbfba8a4e04dd2dbcc551b82f4e98c685d8.tar.bz2 nixlib-bb983fbfba8a4e04dd2dbcc551b82f4e98c685d8.tar.lz nixlib-bb983fbfba8a4e04dd2dbcc551b82f4e98c685d8.tar.xz nixlib-bb983fbfba8a4e04dd2dbcc551b82f4e98c685d8.tar.zst nixlib-bb983fbfba8a4e04dd2dbcc551b82f4e98c685d8.zip |
Merge pull request #19397 from k0ral/nixos-unstable
handbrake: add libx265 to LD_LIBRARY_PATH
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/handbrake/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 9f257cde21f9..1dbe34553b0a 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx ] ++ buildInputsX; - src = fetchurl { url = "http://download.handbrake.fr/releases/${version}/HandBrake-${version}.tar.bz2"; sha256 = "1w720y3bplkz187wgvy4a4xm0vpppg45mlni55l6yi8v2bfk14pv"; @@ -75,6 +74,11 @@ stdenv.mkDerivation rec { cd build ''; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ x265 ]; + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}") + ''; + meta = { homepage = http://handbrake.fr/; description = "A tool for ripping DVDs into video files"; |