diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-18 20:53:01 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-18 20:53:01 +0000 |
commit | d4d7931a6296cd72d3d5f360d628be86bb62246b (patch) | |
tree | 68eb2786a890891d662884e90581b187ab7ee2bc /pkgs/development/libraries/libav | |
parent | c556a6ea46e71e1907d78b71fab36df30297b3ad (diff) | |
download | nixlib-d4d7931a6296cd72d3d5f360d628be86bb62246b.tar nixlib-d4d7931a6296cd72d3d5f360d628be86bb62246b.tar.gz nixlib-d4d7931a6296cd72d3d5f360d628be86bb62246b.tar.bz2 nixlib-d4d7931a6296cd72d3d5f360d628be86bb62246b.tar.lz nixlib-d4d7931a6296cd72d3d5f360d628be86bb62246b.tar.xz nixlib-d4d7931a6296cd72d3d5f360d628be86bb62246b.tar.zst nixlib-d4d7931a6296cd72d3d5f360d628be86bb62246b.zip |
* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
Diffstat (limited to 'pkgs/development/libraries/libav')
-rw-r--r-- | pkgs/development/libraries/libav/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 0d6637d6116b..3fb1650bf46f 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional xvidSupport "--enable-libxvid" ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; - buildInputs = [ pkgconfig lame yasm xz ] + buildInputs = [ pkgconfig lame yasm ] ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional theoraSupport libtheora |