public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #104122 from Chiiruno/dev/rav1e

Browse Source 
rav1e: 0.3.4 -> 0.4.0-alpha // ffmpeg-full: re-enable rav1e
This commit is contained in:
Michael Weiss 2020-11-19 12:38:25 +01:00 committed by GitHub
commit 15fb3be1c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/tools/video/rav1e/default.nix
View File

@ -1,18 +1,32 @@
{ rustPlatform, fetchFromGitHub, lib, nasm, cargo-c }: { stdenv, rustPlatform, fetchurl, fetchFromGitHub, lib, nasm, cargo-c }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rav1e"; pname = "rav1e";
version = "0.3.4"; version = "0.4.0-alpha";
src = fetchFromGitHub { src = stdenv.mkDerivation rec {
owner = "xiph"; name = "${pname}-${version}-source";
repo = "rav1e";
rev = "v${version}"; src = fetchFromGitHub {
sha256 = "0zwjg0sv504i1ahzfy2jgng6qwmyvcrvdrp4n3s90r4kvwjkv8xs"; owner = "xiph";
repo = "rav1e";
rev = "v${version}";
sha256 = "1fw1gxi8330kfhl9hfzpn0lcmyn5604lc74d6g6iadzz2hmv4mb9";
};
cargoLock = fetchurl {
url = "https://github.com/xiph/rav1e/releases/download/v0.4.0-alpha/Cargo.lock";
sha256 = "002s2wlzpifn5p2ahdrjdkjl48c1wr6fslg0if4gf9qpl8qj05fl";
};
installPhase = ''
mkdir -p $out
cp -r ./* $out/
cp ${cargoLock} $out/Cargo.lock
'';
}; };
cargoSha256 = "1mfzshcbxky27nskxhcyrj99wd3v5f597ymgv7nb67lzp5lsyb24"; cargoSha256 = "1i5ldqb77rrhfxxf9krp7f6yj3h6rsqak6hf23fd2znhgmi7psb1";
nativeBuildInputs = [ nasm cargo-c ]; nativeBuildInputs = [ nasm cargo-c ];
postBuild = '' postBuild = ''

2
pkgs/top-level/all-packages.nix
View File

@ -12641,7 +12641,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
openal = if stdenv.isDarwin then null else openal; openal = if stdenv.isDarwin then null else openal;
libmfx = if stdenv.isDarwin then null else intel-media-sdk; libmfx = if stdenv.isDarwin then null else intel-media-sdk;
libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
rav1e = null; rav1e = if stdenv.isDarwin then null else rav1e;
samba = if stdenv.isDarwin then null else samba; samba = if stdenv.isDarwin then null else samba;
vid-stab = if stdenv.isDarwin then null else vid-stab; vid-stab = if stdenv.isDarwin then null else vid-stab;
x265 = if stdenv.isDarwin then null else x265; x265 = if stdenv.isDarwin then null else x265;