diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
| commit | 6dc839d3445e66b259361f08838a8c05b1912e68 (patch) | |
| tree | 5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/games/scummvm | |
| parent | 4309788df022c89765cd7f6b178f4ce7a08db600 (diff) | |
| parent | 327a2eae30b48277bd453842d03a144f618822b2 (diff) | |
| download | nixpkgs-6dc839d3445e66b259361f08838a8c05b1912e68.tar nixpkgs-6dc839d3445e66b259361f08838a8c05b1912e68.tar.gz nixpkgs-6dc839d3445e66b259361f08838a8c05b1912e68.tar.bz2 nixpkgs-6dc839d3445e66b259361f08838a8c05b1912e68.tar.lz nixpkgs-6dc839d3445e66b259361f08838a8c05b1912e68.tar.xz nixpkgs-6dc839d3445e66b259361f08838a8c05b1912e68.tar.zst nixpkgs-6dc839d3445e66b259361f08838a8c05b1912e68.zip | |
Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
Diffstat (limited to 'pkgs/games/scummvm')
| -rw-r--r-- | pkgs/games/scummvm/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index ad03906888c..c1ae54c01bd 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, SDL, zlib, mpeg2dec}: stdenv.mkDerivation { - name = "scummvm-1.1.1"; + name = "scummvm-1.2.0"; src = fetchurl { - url = mirror://sourceforge/scummvm/scummvm-1.1.1.tar.bz2; - sha256 = "0jlxwd8rzk4dn221v9w024w6f503am29hd8djzs1vz0bd72nbj4w"; + url = mirror://sourceforge/scummvm/scummvm-1.2.0.tar.bz2; + sha256 = "1h6sskqjg0cqyan1xkw1vbdqnfpqg42cgbmzpgclmhg3gi6mkz1z"; }; buildInputs = [SDL zlib mpeg2dec]; |