summary refs log tree commit diff
path: root/pkgs/development/libraries/x265
diff options
context:
space:
mode:
authorBen Wolsieffer <benwolsieffer@gmail.com>2018-12-19 17:14:16 -0500
committerJörg Thalheim <joerg@thalheim.io>2018-12-20 12:20:54 +0100
commit07a6bc6ab21a9708ff6bd684aa9f9a0375d32f6b (patch)
treef8b755a4fe31820b2297c8a59143b639753fb2b9 /pkgs/development/libraries/x265
parent425112151db3b05fec01e86cb10c90b4037e9367 (diff)
downloadnixpkgs-07a6bc6ab21a9708ff6bd684aa9f9a0375d32f6b.tar
nixpkgs-07a6bc6ab21a9708ff6bd684aa9f9a0375d32f6b.tar.gz
nixpkgs-07a6bc6ab21a9708ff6bd684aa9f9a0375d32f6b.tar.bz2
nixpkgs-07a6bc6ab21a9708ff6bd684aa9f9a0375d32f6b.tar.lz
nixpkgs-07a6bc6ab21a9708ff6bd684aa9f9a0375d32f6b.tar.xz
nixpkgs-07a6bc6ab21a9708ff6bd684aa9f9a0375d32f6b.tar.zst
nixpkgs-07a6bc6ab21a9708ff6bd684aa9f9a0375d32f6b.zip
x265: fix build on ARM
Diffstat (limited to 'pkgs/development/libraries/x265')
-rw-r--r--pkgs/development/libraries/x265/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 4212687a02a..7ea28f6b61e 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -35,6 +35,11 @@ stdenv.mkDerivation rec {
       url = "https://bitbucket.org/multicoreware/x265/commits/471726d3a0462739ff8e3518eb1a1e8a01de4e8d/raw";
       sha256 = "0mj8lb8ng8lrhzjavap06vjhqf6j0r3sn76c6rhs3012f86lv928";
     })
+    # Fix build on ARM (#406) 
+    (fetchpatch {
+      url = "https://bitbucket.org/multicoreware/x265/issues/attachments/406/multicoreware/x265/1527562952.26/406/X265-2.8-asm-primitives.patch";
+      sha256 = "1vf8bpl37gbd9dcbassgkq9i0rp24qm3bl6hx9zv325174bn402v";
+    })
   ];
 
   postPatch = ''