From 6b433019fa8b6835b45791400a3da9394df574c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 11 Jun 2013 18:03:48 +0200
Subject: [PATCH] libvpx: update

Also set the shared-vpx for firefox, just to be sure.
Firefox, Chromium, and other seem to work fine.
---
 .../networking/browsers/firefox/21.0.nix       |  1 +
 pkgs/development/libraries/libvpx/default.nix  | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/21.0.nix b/pkgs/applications/networking/browsers/firefox/21.0.nix
index 56856923215..cdbc75b8fdf 100644
--- a/pkgs/applications/networking/browsers/firefox/21.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/21.0.nix
@@ -50,6 +50,7 @@ rec {
       "--enable-system-hunspell"
       "--enable-system-pixman"
       "--enable-system-sqlite"
+      "--with-system-libvpx"
       "--disable-crashreporter"
       "--disable-tests"
       "--disable-necko-wifi" # maybe we want to enable this at some point
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 1c225aa7853..494a5c36a3c 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -1,11 +1,13 @@
 {stdenv, fetchurl, bash, yasm, which, perl}:
 
+let version = "1.2.0";
+in
 stdenv.mkDerivation rec {
-  name = "libvpx-1.1.0";
-  
-  src = fetchurl {
-    url = http://webm.googlecode.com/files/libvpx-v1.1.0.tar.bz2;
-    sha256 = "1ibjxcdsazqfbbjhb8w56vy3n9qwny2m9q4kzx4rmk9v9g7p9q4w";
+  name = "libvpx-" + version;
+
+  src = fetchurl { # sadly, there's no official tarball for this release
+    url = "ftp://ftp.archlinux.org/other/libvpx/libvpx-${version}.tar.xz";
+    sha256 = "02k9ylswgr2hvjqmg422fa9ggym0g94gzwb14nnckly698rvjc50";
   };
 
   patchPhase = ''
@@ -14,15 +16,17 @@ stdenv.mkDerivation rec {
     sed -e '/enable linux/d' -i configure
   '';
 
-  configureScript = "../configure";
+  buildInputs = [ yasm which perl ];
 
   preConfigure = ''
     mkdir -p build
     cd build
   '';
 
+  configureScript = "../configure";
   configureFlags = [
     "--disable-install-srcs"
+    "--disable-install-docs"
     "--disable-examples"
     "--enable-vp8"
     "--enable-runtime-cpu-detect"
@@ -34,8 +38,6 @@ stdenv.mkDerivation rec {
     make quiet=false DIST_DIR=$out install
   '';
 
-  buildInputs = [ yasm which perl ];
-
   meta = {
     description = "VP8 video encoder";
     homepage = http://code.google.com/p/webm;