diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-05 17:41:15 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-05 17:41:15 -0500 |
| commit | 992bd2f6d34b2f560fc17df6fa3708fcade1abac (patch) | |
| tree | c6bb9677ef9e72819f5cb6daf2ac7df667a69d02 /pkgs/development/libraries/libav/default.nix | |
| parent | 93cd0685c5ac4d8f21d8586d3e5c45cd7394fab9 (diff) | |
| parent | ab77a6bb1e7d2ff475210ad392f1a9bd1bb6ba3a (diff) | |
| download | nixlib-992bd2f6d34b2f560fc17df6fa3708fcade1abac.tar nixlib-992bd2f6d34b2f560fc17df6fa3708fcade1abac.tar.gz nixlib-992bd2f6d34b2f560fc17df6fa3708fcade1abac.tar.bz2 nixlib-992bd2f6d34b2f560fc17df6fa3708fcade1abac.tar.lz nixlib-992bd2f6d34b2f560fc17df6fa3708fcade1abac.tar.xz nixlib-992bd2f6d34b2f560fc17df6fa3708fcade1abac.tar.zst nixlib-992bd2f6d34b2f560fc17df6fa3708fcade1abac.zip | |
Merge commit 'ab77a6bb1e7d2ff475210ad392f1a9bd1bb6ba3a' into gcc-simplify-flags
Diffstat (limited to 'pkgs/development/libraries/libav/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libav/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 94ebaed9c2a1..e348fe0fae28 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -27,9 +27,10 @@ let inherit (stdenv.lib) optional optionals hasPrefix; in let result = { + # e.g. https://libav.org/releases/libav-11.11.tar.xz.sha1 libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f"; - libav_11 = libavFun "11.10" "38db6721ca8423682e4d614c170eccc33ba32e00"; - libav_12 = libavFun "12" "4ecde7274621c82a6882b7614d907b28de25cc4e"; + libav_11 = libavFun "11.11" "d7444fa4f135bdd7347cc962ab4b5228796b0f23"; + libav_12 = libavFun "12.2" "3784b15f88076ca0ab8fb6b0377e975b83a5c9f5"; }; libavFun = version : sha1 : stdenv.mkDerivation rec { @@ -70,7 +71,8 @@ let ++ optional freetypeSupport "--enable-libfreetype" ; - buildInputs = [ pkgconfig lame yasm zlib bzip2 SDL ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lame yasm zlib bzip2 SDL ] ++ [ perl ] # for install-man target ++ optional mp3Support lame ++ optional speexSupport speex |