diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/video')
-rw-r--r-- | nixpkgs/pkgs/tools/video/gopro/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/video/rav1e/default.nix | 32 |
2 files changed, 11 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/tools/video/gopro/default.nix b/nixpkgs/pkgs/tools/video/gopro/default.nix index f783b086345a..9979b224868a 100644 --- a/nixpkgs/pkgs/tools/video/gopro/default.nix +++ b/nixpkgs/pkgs/tools/video/gopro/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, ffmpeg +, ffmpeg_3 , imagemagick , makeWrapper , mplayer @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { install -Dm755 gopro -t $out/bin wrapProgram $out/bin/gopro \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ ffmpeg imagemagick mplayer ]}" + --prefix PATH ":" "${stdenv.lib.makeBinPath [ ffmpeg_3 imagemagick mplayer ]}" runHook postInstall ''; diff --git a/nixpkgs/pkgs/tools/video/rav1e/default.nix b/nixpkgs/pkgs/tools/video/rav1e/default.nix index 02f6d12278a4..b8e43fe4f10f 100644 --- a/nixpkgs/pkgs/tools/video/rav1e/default.nix +++ b/nixpkgs/pkgs/tools/video/rav1e/default.nix @@ -1,31 +1,17 @@ -{ rustPlatform, fetchFromGitHub, fetchurl, stdenv, lib, nasm }: +{ rustPlatform, fetchFromGitHub, lib, nasm }: rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.3.2"; + version = "0.3.3"; - src = stdenv.mkDerivation rec { - name = "${pname}-${version}-source"; - - src = fetchFromGitHub { - owner = "xiph"; - repo = "rav1e"; - rev = "v${version}"; - sha256 = "0qqw397yfglwj9kg45imhx1p5bb0nsx2gkaxj4lcc9i1hav6ia43"; - }; - cargoLock = fetchurl { - url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock"; - sha256 = "1kdr3q97vq3mip1h7iv2iy9qzlgb69y6nwjzbw9nfi7dl7ip6q3l"; - }; - - installPhase = '' - mkdir -p $out - cp -R ./* $out/ - cp ${cargoLock} $out/Cargo.lock - ''; + src = fetchFromGitHub { + owner = "xiph"; + repo = "rav1e"; + rev = "v${version}"; + sha256 = "0a9dryag4x35a2c45qiq1j5xk9ydcpw1g6kici85d2yrc2z3hwrx"; }; - cargoSha256 = "03zsvavk7wskz843qxwwcymhclarcp6nfxwa1mwna3nmzvlm1hwb"; + cargoSha256 = "1xaincrmpicp0skf9788w5631x1hxvifvq06hh5ribdz79zclzx3"; nativeBuildInputs = [ nasm ]; @@ -37,7 +23,7 @@ rustPlatform.buildRustPackage rec { libaom (the reference encoder) is too slow. Features: https://github.com/xiph/rav1e#features ''; - inherit (src.src.meta) homepage; + inherit (src.meta) homepage; changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}"; license = licenses.bsd2; maintainers = [ maintainers.primeos ]; |