diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index d11a93254bf..4212687a02a 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, yasm +{ stdenv, fetchurl, fetchpatch, cmake, yasm , debugSupport ? false # Run-time sanity checks (debugging) , highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel , werrorSupport ? false # Warnings as errors @@ -16,19 +16,28 @@ in stdenv.mkDerivation rec { name = "x265-${version}"; - version = "2.7"; + version = "2.9"; src = fetchurl { urls = [ - "http://get.videolan.org/x265/x265_${version}.tar.gz" - "https://github.com/videolan/x265/archive/${version}.tar.gz" + "https://get.videolan.org/x265/x265_${version}.tar.gz" + "ftp://ftp.videolan.org/pub/videolan/x265/x265_${version}.tar.gz" ]; - sha256 = "18llni1m8kfvdwy5bp950z6gyd0nijmvi3hzd6gd8vpy5yk5zrym"; + sha256 = "090hp4216isis8q5gb7bwzia8rfyzni54z21jnwm97x3hiy6ibpb"; }; enableParallelBuilding = true; - patchPhase = '' + patches = [ + # Fix issue #442 (linking issue on non-x86 platforms) + # Applies on v2.9 only, this should be removed at next update + (fetchpatch { + url = "https://bitbucket.org/multicoreware/x265/commits/471726d3a0462739ff8e3518eb1a1e8a01de4e8d/raw"; + sha256 = "0mj8lb8ng8lrhzjavap06vjhqf6j0r3sn76c6rhs3012f86lv928"; + }) + ]; + + postPatch = '' sed -i 's/unknown/${version}/g' source/cmake/version.cmake '';