summary refs log tree commit diff
path: root/pkgs/development/libraries/xvidcore
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-04-30 21:58:47 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-04-30 21:58:47 +0000
commit1215f3a7a439616a5202e4750e4840a33e4d4341 (patch)
tree40115b15b87c571fb0a88025df02129d497ebea7 /pkgs/development/libraries/xvidcore
parentb3870f014843733ea832d10b0c7aa43912fe783b (diff)
downloadnixpkgs-1215f3a7a439616a5202e4750e4840a33e4d4341.tar
nixpkgs-1215f3a7a439616a5202e4750e4840a33e4d4341.tar.gz
nixpkgs-1215f3a7a439616a5202e4750e4840a33e4d4341.tar.bz2
nixpkgs-1215f3a7a439616a5202e4750e4840a33e4d4341.tar.lz
nixpkgs-1215f3a7a439616a5202e4750e4840a33e4d4341.tar.xz
nixpkgs-1215f3a7a439616a5202e4750e4840a33e4d4341.tar.zst
nixpkgs-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/xvidcore')
-rw-r--r--pkgs/development/libraries/xvidcore/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix
index b02ae2b14e9..7276402cbf5 100644
--- a/pkgs/development/libraries/xvidcore/default.nix
+++ b/pkgs/development/libraries/xvidcore/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, nasm}:
 
 stdenv.mkDerivation rec {
   name = "xvidcore-1.2.2";
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     cd build/generic
   '';
+
+  buildInputs = [ nasm ];
   
   meta = {
     description = "MPEG-4 video codec for PC";