summary refs log tree commit diff
path: root/pkgs/development/libraries/libvpx
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-06-11 18:03:48 +0200
committerVladimír Čunát <vcunat@gmail.com>2013-06-11 18:03:48 +0200
commit6b433019fa8b6835b45791400a3da9394df574c0 (patch)
tree26b2215bb4cef3d98704e31c35988f54ab200698 /pkgs/development/libraries/libvpx
parentc1bec6fb5b7b247e5e2119e4e0bf96d02da55b0e (diff)
downloadnixpkgs-6b433019fa8b6835b45791400a3da9394df574c0.tar
nixpkgs-6b433019fa8b6835b45791400a3da9394df574c0.tar.gz
nixpkgs-6b433019fa8b6835b45791400a3da9394df574c0.tar.bz2
nixpkgs-6b433019fa8b6835b45791400a3da9394df574c0.tar.lz
nixpkgs-6b433019fa8b6835b45791400a3da9394df574c0.tar.xz
nixpkgs-6b433019fa8b6835b45791400a3da9394df574c0.tar.zst
nixpkgs-6b433019fa8b6835b45791400a3da9394df574c0.zip
libvpx: update
Also set the shared-vpx for firefox, just to be sure.
Firefox, Chromium, and other seem to work fine.
Diffstat (limited to 'pkgs/development/libraries/libvpx')
-rw-r--r--pkgs/development/libraries/libvpx/default.nix18
1 files changed, 10 insertions, 8 deletions
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;