diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-30 08:33:47 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-30 08:33:47 +0000 |
| commit | 7b6ce0f9df38d40188b36f556edec3e65ac29562 (patch) | |
| tree | 7916a73918d3827e7d148551b78442a26fa3a5f6 /pkgs/development/libraries/x264/default.nix | |
| parent | 9b48c69f85d6d49bc71f29376332e17c6c872e9a (diff) | |
| download | nixpkgs-7b6ce0f9df38d40188b36f556edec3e65ac29562.tar nixpkgs-7b6ce0f9df38d40188b36f556edec3e65ac29562.tar.gz nixpkgs-7b6ce0f9df38d40188b36f556edec3e65ac29562.tar.bz2 nixpkgs-7b6ce0f9df38d40188b36f556edec3e65ac29562.tar.lz nixpkgs-7b6ce0f9df38d40188b36f556edec3e65ac29562.tar.xz nixpkgs-7b6ce0f9df38d40188b36f556edec3e65ac29562.tar.zst nixpkgs-7b6ce0f9df38d40188b36f556edec3e65ac29562.zip | |
Updating x264, and adding x264 support to mplayer and ffmpeg.
svn path=/nixpkgs/trunk/; revision=21451
Diffstat (limited to 'pkgs/development/libraries/x264/default.nix')
| -rw-r--r-- | pkgs/development/libraries/x264/default.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 636a5081c5f..606fd825d16 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,16 +1,19 @@ -args: -args.stdenv.mkDerivation rec { - version = "snapshot-20080521-2245"; +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "snapshot-20100429-2245"; name = "x264-${version}"; - src = args.fetchurl { + src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2"; - sha256 = "07khxih1lmhvrzlaksqmaghbi8w2yyjrjcw867gi2y4z1h0ndhks"; + sha256 = "16b24mc63zyp4h4fqyvgzbdclnhpay4l72yfqzwnzsnlby94zwcj"; }; - configureFlags= if args.stdenv.system == "x86_64-linux" then ["--enable-pic"] else []; + patchPhase = '' + sed -i s,/bin/bash,${stdenv.bash}/bin/bash, configure version.sh + ''; - buildInputs =(with args; []); + configureFlags = [ "--disable-asm" "--enable-shared" ]; meta = { description = "library for encoding H264/AVC video streams"; |