nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-12 15:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #78846 from worldofpeace/x264-aarch64-fix

Browse Source 
x264: fix on ARM
This commit is contained in:
worldofpeace 2020-01-30 09:03:20 -05:00 committed by GitHub
commit 49f13ce2b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/x264/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "x264";
version = "20190517-2245";
version = "20191217-2245";
src = fetchurl {
url = "https://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2";
sha256 = "1xv41z04km3rf374xk3ny7v8ibr211ph0j5am0909ln63mphc48f";
sha256 = "0q214q4rhbhigyx3dfhp6d5v5gzln01cxccl153ps5ih567mqjdj";
};
# Upstream ./configure greps for (-mcpu|-march|-mfpu) in CFLAGS, which in nix
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
preConfigure = lib.optionalString (stdenv.buildPlatform.isx86_64 || stdenv.hostPlatform.isi686) ''
# `AS' is set to the binutils assembler, but we need nasm
unset AS
'' + lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) ''
export AS=$CC
'';
configureFlags = [ "--enable-shared" ]