Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 361d04b37609
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b82a49382374
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 15, 2018

  1. x265: 2.7 -> 2.9 

    Encoder enhancements, AVX-512 support, ...

x265: fix linking issue on aarch64
    @c0bw3b
    Christian S authored and c0bw3b committed Nov 15, 2018
    Copy the full SHA
    064f35f View commit details

  2. Merge pull request #50362 from c0bw3b/pkg/x265 

    x265: 2.7 -> 2.9
    @c0bw3b
    c0bw3b authored Nov 15, 2018
    Copy the full SHA
    b82a493 View commit details
Showing with 15 additions and 6 deletions.
  1. +15 −6 pkgs/development/libraries/x265/default.nix
21 changes: 15 additions & 6 deletions pkgs/development/libraries/x265/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
'';