diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-25 15:35:59 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-25 15:35:59 -0700 |
| commit | fe6055dc2a1fabea8eebabd268943d19fb12d7b7 (patch) | |
| tree | eca5ff82ea25c7b9657091c077d33897a8df8c78 /pkgs/development/libraries | |
| parent | 8b3c7af3586932d20113a01303a6028bf1849107 (diff) | |
| parent | 84a15d6d0865e9cc58d78dd68f3ff793248a1956 (diff) | |
| download | nixlib-fe6055dc2a1fabea8eebabd268943d19fb12d7b7.tar nixlib-fe6055dc2a1fabea8eebabd268943d19fb12d7b7.tar.gz nixlib-fe6055dc2a1fabea8eebabd268943d19fb12d7b7.tar.bz2 nixlib-fe6055dc2a1fabea8eebabd268943d19fb12d7b7.tar.lz nixlib-fe6055dc2a1fabea8eebabd268943d19fb12d7b7.tar.xz nixlib-fe6055dc2a1fabea8eebabd268943d19fb12d7b7.tar.zst nixlib-fe6055dc2a1fabea8eebabd268943d19fb12d7b7.zip | |
Merge pull request #6984 from spwhitt/x264
X264 updates
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/x264/default.nix | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 51666e3ba6de..6c541f1aa682 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, yasm}: +{stdenv, fetchurl, yasm, enable10bit ? false}: stdenv.mkDerivation rec { - version = "snapshot-20130424-2245-stable"; - name = "x264-20130424_2245"; + version = "snapshot-20141218-2245-stable"; + name = "x264-20141218-2245"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2"; - sha256 = "0vzyqsgrm9k3hzka2p8ib92jl0ha8d4267r2rb3pr9gmpjaj9azk"; + sha256 = "1gp1f0382vh2hmgc23ldqyywcfljg8lsgl2849ymr14r6gxfh69m"; }; patchPhase = '' @@ -14,13 +14,16 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--enable-shared" ] - ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"; + ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic" + ++ stdenv.lib.optional (enable10bit) "--bit-depth=10"; buildInputs = [ yasm ]; - meta = { + meta = with stdenv.lib; { description = "library for encoding H264/AVC video streams"; - homepage = http://www.videolan.org/developers/x264.html; - license = "GPL"; + homepage = http://www.videolan.org/developers/x264.html; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.spwhitt ]; }; } |