diff options
Diffstat (limited to 'pkgs/development/libraries/libvpx/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libvpx/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 46e73a121fe..45fc442a713 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,13 +1,13 @@ -{stdenv, fetchurl, bash, yasm, which, perl}: +{stdenv, fetchurl, bash, yasm, which, perl, binutils}: -let version = "1.2.0"; +let version = "1.3.0"; in stdenv.mkDerivation rec { 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"; + url = "http://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2"; + sha1 = "191b95817aede8c136cc3f3745fb1b8c50e6d5dc"; }; patchPhase = '' @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sed -e '/enable linux/d' -i configure ''; - buildInputs = [ yasm which perl ]; + buildInputs = [ yasm which perl ] + ++ stdenv.lib.optional stdenv.isDarwin binutils; # new asm opcode support preConfigure = '' mkdir -p build @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { [ "--disable-install-srcs" "--disable-install-docs" "--disable-examples" "--enable-vp8" "--enable-runtime-cpu-detect" "--enable-pic" ] # --enable-shared is only supported on ELF - ++ stdenv.lib.optional (!stdenv.isDarwin) "--enable-shared"; + ++ stdenv.lib.optional (!stdenv.isDarwin) "--disable-static --enable-shared"; installPhase = '' make quiet=false DIST_DIR=$out install |