From b9fb4fee619ad8bfa6419502ceb9e9c654844b58 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Sep 2010 19:40:30 +0000 Subject: [PATCH] Move amarok from kde4. to applications/audio svn path=/nixpkgs/trunk/; revision=23956 --- pkgs/applications/audio/amarok/default.nix | 31 +++++++++++++++++++ pkgs/desktops/kde-4.4/default.nix | 9 +----- .../kde-4.4/extragear/amarok/default.nix | 29 ----------------- pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 34 insertions(+), 37 deletions(-) create mode 100644 pkgs/applications/audio/amarok/default.nix delete mode 100644 pkgs/desktops/kde-4.4/extragear/amarok/default.nix diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix new file mode 100644 index 00000000000..29364a6a767 --- /dev/null +++ b/pkgs/applications/audio/amarok/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl +, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs, automoc4, phonon +, strigi, soprano, qca2, libmtp, liblastfmFM, libgpod }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + pname = "amarok"; + version = "2.3.2"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; + sha256 = "0dw2928vkd42h3d8nsb8i4xhp8qfj1zsfc1m9wrzrsxl0vd6j9c4"; + }; + + QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; + buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl + libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi + soprano qca2 libmtp liblastfmFM libgpod ]; + + postInstall = '' + mkdir -p $out/nix-support + echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages + ''; + meta = { + description = "Popular music player for KDE"; + license = "GPL"; + homepage = http://amarok.kde.org; + inherit (kdelibs.meta) platforms maintainers; + }; +} diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 6a5756f8d32..2a7b22e8acd 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -215,13 +215,6 @@ pkgs.recurseIntoAttrs (rec { #### EXTRA GEAR - amarok = import ./extragear/amarok { - inherit (pkgs) stdenv fetchurl lib cmake qt4 qtscriptgenerator perl gettext; - inherit (pkgs) curl mysql libxml2 taglib taglib_extras loudmouth; - inherit kdelibs; - inherit automoc4 phonon strigi soprano qca2; - }; - digikam = import ./extragear/digikam { inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext liblqr1 lensfun; @@ -283,7 +276,7 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon; }; - inherit (pkgs) konversation yakuake ktorrent koffice; + inherit (pkgs) konversation yakuake ktorrent koffice amarok; gtk_qt_engine = import ./extragear/gtk-qt-engine { inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext; diff --git a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix b/pkgs/desktops/kde-4.4/extragear/amarok/default.nix deleted file mode 100644 index 9650319466e..00000000000 --- a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl, libxml2, mysql, taglib, taglib_extras, loudmouth -, kdelibs, automoc4, phonon, strigi, soprano, qca2}: - -stdenv.mkDerivation { - name = "amarok-2.3.1"; - src = fetchurl { - url = mirror://kde/stable/amarok/2.3.1/src/amarok-2.3.1.tar.bz2; - sha256 = "0wjaic35bpv6dnnv2wwrbbsqbpng5cn7xfd3ykx25yjg9d6kzvrz"; - }; - inherit mysql loudmouth; - QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; - - buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth - kdelibs automoc4 phonon strigi soprano qca2]; - patchPhase = '' - sed -i -e "s|/usr|$loudmouth|g" cmake/modules/FindLoudmouth.cmake - sed -i -e "s|/usr|$mysql|g" cmake/modules/FindMySQLAmarok.cmake - ''; - postInstall = '' - mkdir -p $out/nix-support - echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages - ''; - meta = { - description = "Popular music player for KDE"; - license = "GPL"; - homepage = http://amarok.kde.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 400b4d27c3d..2df40ffc423 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5161,6 +5161,8 @@ let inherit (pkgsi686Linux.gtkLibs) glib pango atk gtk; }; + amarok = newScope pkgs.kde4 ../applications/audio/amarok { }; + amsn = callPackage ../applications/networking/instant-messengers/amsn { libstdcpp = gcc33.gcc; };