diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
| commit | 6f2fac6466cbc684f01093364e60bb96b79c120f (patch) | |
| tree | 2b0ee90e26a0d6ed8a081351299a66daf35ef9f9 /pkgs/desktops/kde-4.4/multimedia/default.nix | |
| parent | 6d62947d71342aa29441a720d4eeb2f003126c76 (diff) | |
| parent | 93d2b4b7bfe5c78e36c93f94a0c057cde04b580f (diff) | |
| download | nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.gz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.bz2 nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.lz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.xz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.zst nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.zip | |
Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross) svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
Diffstat (limited to 'pkgs/desktops/kde-4.4/multimedia/default.nix')
| -rw-r--r-- | pkgs/desktops/kde-4.4/multimedia/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/kde-4.4/multimedia/default.nix b/pkgs/desktops/kde-4.4/multimedia/default.nix index c4ef2f02486..f33a4d748c0 100644 --- a/pkgs/desktops/kde-4.4/multimedia/default.nix +++ b/pkgs/desktops/kde-4.4/multimedia/default.nix @@ -2,10 +2,10 @@ , kdelibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdemultimedia-4.4.1"; + name = "kdemultimedia-4.4.2"; src = fetchurl { - url = mirror://kde/stable/4.4.1/src/kdemultimedia-4.4.1.tar.bz2; - sha256 = "1ahm16y65m9k5g1mzrzy26hdyb8zrn8jwfkq4p3s9vixr02fijkg"; + url = mirror://kde/stable/4.4.2/src/kdemultimedia-4.4.2.tar.bz2; + sha256 = "15qq25ijnv0jsmxpc5fv7hwianxpqsz8i89j460kndm4pyplhdbj"; }; buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia lame kdelibs automoc4 phonon ]; |