public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding yasm, and making x264 and xvid codecs be compiled with their assembly code

Browse Source 
svn path=/nixpkgs/trunk/; revision=21470
This commit is contained in:
Lluís Batlle i Rossell 2010-04-30 21:58:47 +00:00
parent b3870f0148
commit 1215f3a7a4
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/compilers/yasm/default.nix Normal file
View File

@ -0,0 +1,16 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "yasm-2.05.01";
src = fetchurl {
url = http://www.tortall.net/projects/yasm/releases/yasm-1.0.0.tar.gz;
sha256 = "0nd95r9y5r3p9mvdyj1yhvlz9zjw0id1g470c7i1p3p0x0n6zc06";
};
meta = {
homepage = http://www.tortall.net/projects/yasm/;
description = "Complete rewrite of the NASM assembler";
license = "BSD";
};
}

6
pkgs/development/libraries/x264/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl }: {stdenv, fetchurl, yasm}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "snapshot-20100429-2245"; version = "snapshot-20100429-2245";
@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
sed -i s,/bin/bash,${stdenv.shell}, configure version.sh sed -i s,/bin/bash,${stdenv.shell}, configure version.sh
''; '';
configureFlags = [ "--disable-asm" "--enable-shared" ]; configureFlags = [ "--enable-shared" ];
buildInputs = [ yasm ];
meta = { meta = {
description = "library for encoding H264/AVC video streams"; description = "library for encoding H264/AVC video streams";

4
pkgs/development/libraries/xvidcore/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl}: {stdenv, fetchurl, nasm}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xvidcore-1.2.2"; name = "xvidcore-1.2.2";
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
cd build/generic cd build/generic
''; '';
buildInputs = [ nasm ];
meta = { meta = {
description = "MPEG-4 video codec for PC"; description = "MPEG-4 video codec for PC";

7
pkgs/top-level/all-packages.nix
View File

@ -2604,6 +2604,9 @@ let
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
yasm = import ../development/compilers/yasm {
inherit fetchurl stdenv;
};
### DEVELOPMENT / INTERPRETERS ### DEVELOPMENT / INTERPRETERS
@ -5202,7 +5205,7 @@ let
}; };
x264 = import ../development/libraries/x264 { x264 = import ../development/libraries/x264 {
inherit fetchurl stdenv; inherit fetchurl stdenv yasm;
}; };
xapian = makeOverridable (import ../development/libraries/xapian) { xapian = makeOverridable (import ../development/libraries/xapian) {
@ -5248,7 +5251,7 @@ let
}; };
xvidcore = import ../development/libraries/xvidcore { xvidcore = import ../development/libraries/xvidcore {
inherit fetchurl stdenv; inherit fetchurl stdenv nasm;
}; };
zangband = builderDefsPackage (import ../games/zangband) { zangband = builderDefsPackage (import ../games/zangband) {