diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-30 21:58:47 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-30 21:58:47 +0000 |
| commit | 1215f3a7a439616a5202e4750e4840a33e4d4341 (patch) | |
| tree | 40115b15b87c571fb0a88025df02129d497ebea7 /pkgs/development/libraries/x264 | |
| parent | b3870f014843733ea832d10b0c7aa43912fe783b (diff) | |
| download | nixlib-1215f3a7a439616a5202e4750e4840a33e4d4341.tar nixlib-1215f3a7a439616a5202e4750e4840a33e4d4341.tar.gz nixlib-1215f3a7a439616a5202e4750e4840a33e4d4341.tar.bz2 nixlib-1215f3a7a439616a5202e4750e4840a33e4d4341.tar.lz nixlib-1215f3a7a439616a5202e4750e4840a33e4d4341.tar.xz nixlib-1215f3a7a439616a5202e4750e4840a33e4d4341.tar.zst nixlib-1215f3a7a439616a5202e4750e4840a33e4d4341.zip | |
Adding yasm, and making x264 and xvid codecs be compiled with their assembly code
svn path=/nixpkgs/trunk/; revision=21470
Diffstat (limited to 'pkgs/development/libraries/x264')
| -rw-r--r-- | pkgs/development/libraries/x264/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index e6fbb6d5cc58..6928f9f6df4b 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{stdenv, fetchurl, yasm}: stdenv.mkDerivation rec { version = "snapshot-20100429-2245"; @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { sed -i s,/bin/bash,${stdenv.shell}, configure version.sh ''; - configureFlags = [ "--disable-asm" "--enable-shared" ]; + configureFlags = [ "--enable-shared" ]; + + buildInputs = [ yasm ]; meta = { description = "library for encoding H264/AVC video streams"; |