lol

Move amarok from kde4. to applications/audio

svn path=/nixpkgs/trunk/; revision=23956

+34 -37
+31
pkgs/applications/audio/amarok/default.nix
··· 1 + { stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl 2 + , libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs, automoc4, phonon 3 + , strigi, soprano, qca2, libmtp, liblastfmFM, libgpod }: 4 + 5 + stdenv.mkDerivation rec { 6 + name = "${pname}-${version}"; 7 + 8 + pname = "amarok"; 9 + version = "2.3.2"; 10 + 11 + src = fetchurl { 12 + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; 13 + sha256 = "0dw2928vkd42h3d8nsb8i4xhp8qfj1zsfc1m9wrzrsxl0vd6j9c4"; 14 + }; 15 + 16 + QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; 17 + buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl 18 + libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi 19 + soprano qca2 libmtp liblastfmFM libgpod ]; 20 + 21 + postInstall = '' 22 + mkdir -p $out/nix-support 23 + echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages 24 + ''; 25 + meta = { 26 + description = "Popular music player for KDE"; 27 + license = "GPL"; 28 + homepage = http://amarok.kde.org; 29 + inherit (kdelibs.meta) platforms maintainers; 30 + }; 31 + }
+1 -8
pkgs/desktops/kde-4.4/default.nix
··· 215 215 216 216 #### EXTRA GEAR 217 217 218 - amarok = import ./extragear/amarok { 219 - inherit (pkgs) stdenv fetchurl lib cmake qt4 qtscriptgenerator perl gettext; 220 - inherit (pkgs) curl mysql libxml2 taglib taglib_extras loudmouth; 221 - inherit kdelibs; 222 - inherit automoc4 phonon strigi soprano qca2; 223 - }; 224 - 225 218 digikam = import ./extragear/digikam { 226 219 inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext 227 220 liblqr1 lensfun; ··· 283 276 inherit automoc4 phonon; 284 277 }; 285 278 286 - inherit (pkgs) konversation yakuake ktorrent koffice; 279 + inherit (pkgs) konversation yakuake ktorrent koffice amarok; 287 280 288 281 gtk_qt_engine = import ./extragear/gtk-qt-engine { 289 282 inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;
-29
pkgs/desktops/kde-4.4/extragear/amarok/default.nix
··· 1 - { stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl, libxml2, mysql, taglib, taglib_extras, loudmouth 2 - , kdelibs, automoc4, phonon, strigi, soprano, qca2}: 3 - 4 - stdenv.mkDerivation { 5 - name = "amarok-2.3.1"; 6 - src = fetchurl { 7 - url = mirror://kde/stable/amarok/2.3.1/src/amarok-2.3.1.tar.bz2; 8 - sha256 = "0wjaic35bpv6dnnv2wwrbbsqbpng5cn7xfd3ykx25yjg9d6kzvrz"; 9 - }; 10 - inherit mysql loudmouth; 11 - QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; 12 - 13 - buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth 14 - kdelibs automoc4 phonon strigi soprano qca2]; 15 - patchPhase = '' 16 - sed -i -e "s|/usr|$loudmouth|g" cmake/modules/FindLoudmouth.cmake 17 - sed -i -e "s|/usr|$mysql|g" cmake/modules/FindMySQLAmarok.cmake 18 - ''; 19 - postInstall = '' 20 - mkdir -p $out/nix-support 21 - echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages 22 - ''; 23 - meta = { 24 - description = "Popular music player for KDE"; 25 - license = "GPL"; 26 - homepage = http://amarok.kde.org; 27 - maintainers = [ lib.maintainers.sander ]; 28 - }; 29 - }
+2
pkgs/top-level/all-packages.nix
··· 5161 5161 inherit (pkgsi686Linux.gtkLibs) glib pango atk gtk; 5162 5162 }; 5163 5163 5164 + amarok = newScope pkgs.kde4 ../applications/audio/amarok { }; 5165 + 5164 5166 amsn = callPackage ../applications/networking/instant-messengers/amsn { 5165 5167 libstdcpp = gcc33.gcc; 5166 5168 };