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

* Use a tarball for ffmpeg_svn.

Browse Source 
svn path=/nixpkgs/trunk/; revision=10620
This commit is contained in:
Eelco Dolstra 2008-02-10 23:00:58 +00:00
parent 4ad48cffed
commit 1e7824a683
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix
View File

@ -1,17 +1,11 @@
{stdenv, fetchsvn}:
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "ffmpeg-svn-2007-12-04";
src = fetchsvn {
url = svn://svn.mplayerhq.hu/ffmpeg/trunk ;
rev = "11164";
#sha256 = "95658455e466aeab5a302ddd6e7b2f79f620d4495012add46028a548e6c364b2";
sha256 = "c97b0cd791f8408cfc69452ff7afbf00d34b367e493dfbcae830fba99c229189";
name = "ffmpeg-svn-pre-r11901";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/ffmpeg-svn-r11901.tar.bz2;
sha256 = "0l5207gnfaz57pvlxpxyjphyz0mp9plnxzd0aghy0nz3hmqh4rs7";
};
/*fetchurl {
url = http://ffmpeg.mplayerhq.hu/ffmpeg-export-snapshot.tar.bz2;
sha256 = "040a35f0c004323af14329c09ad3cff8d040e2cf9797d97cde3d9d83d02b4d87";
};*/
# !!! Hm, what are the legal consequences of --enable-gpl?
configureFlags = "--enable-shared --enable-pp --enable-gpl --disable-ffserver --disable-ffplay";
}

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

@ -2123,14 +2123,13 @@ rec {
};
ffmpeg_svn = import ../development/libraries/ffmpeg_svn_snapshot {
inherit fetchsvn stdenv;
inherit fetchurl stdenv;
};
fftw = import ../development/libraries/fftw {
inherit fetchurl stdenv builderDefs stringsWithDeps;
};
fltk20 = (import ../development/libraries/fltk) {
inherit mkDerivationByConfiguration x11 lib;
inherit fetchurl stdenv mesa mesaHeaders libpng libjpeg zlib ;