diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-10 23:00:58 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-10 23:00:58 +0000 |
| commit | 1e7824a683a071e0d736299c26571ebc1ae8313c (patch) | |
| tree | ff9bcb783de939cc1a40fed136574a2360933e60 /pkgs | |
| parent | 4ad48cffedcc74ba2f338ddf048ed0107cf682ef (diff) | |
| download | nixpkgs-1e7824a683a071e0d736299c26571ebc1ae8313c.tar nixpkgs-1e7824a683a071e0d736299c26571ebc1ae8313c.tar.gz nixpkgs-1e7824a683a071e0d736299c26571ebc1ae8313c.tar.bz2 nixpkgs-1e7824a683a071e0d736299c26571ebc1ae8313c.tar.lz nixpkgs-1e7824a683a071e0d736299c26571ebc1ae8313c.tar.xz nixpkgs-1e7824a683a071e0d736299c26571ebc1ae8313c.tar.zst nixpkgs-1e7824a683a071e0d736299c26571ebc1ae8313c.zip | |
* Use a tarball for ffmpeg_svn.
svn path=/nixpkgs/trunk/; revision=10620
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix b/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix index 90978eb2908..980b04a9d61 100644 --- a/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix +++ b/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix @@ -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"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b2d9b7674f..cc227696bf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 ; |