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

ffmpeg-full: inherit src/version from ffmpeg

Browse Source
This commit is contained in:
zowoq 2020-06-08 14:38:32 +10:00 committed by Profpatsch
parent a505e9d7f4
commit 2c79d7f0c2
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm { stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm
/* /*
* Licensing options (yes some are listed twice, filters and such are not listed) * Licensing options (yes some are listed twice, filters and such are not listed)
*/ */
@ -239,12 +239,7 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ffmpeg-full"; pname = "ffmpeg-full";
version = "4.2.3"; inherit (ffmpeg) src version;
src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1";
};
patches = [ ./prefer-libdav1d-over-libaom.patch ]; patches = [ ./prefer-libdav1d-over-libaom.patch ];

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

@ -11681,6 +11681,8 @@ in
ffmpeg = ffmpeg_3; ffmpeg = ffmpeg_3;
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
ffmpeg = ffmpeg_4;
# The following need to be fixed on Darwin # The following need to be fixed on Darwin
frei0r = if stdenv.isDarwin then null else frei0r; frei0r = if stdenv.isDarwin then null else frei0r;
game-music-emu = if stdenv.isDarwin then null else game-music-emu; game-music-emu = if stdenv.isDarwin then null else game-music-emu;