mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

Move amarok from kde4. to applications/audio

Browse source 
svn path=/nixpkgs/trunk/; revision=23956
This commit is contained in:
Yury G. Kudryashov 2010-09-26 19:40:30 +00:00
parent 086945942d
commit b9fb4fee61
4 changed files with 34 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkgs/applications/audio/amarok/default.nix Normal file
View file

@ -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;
};
}

9
pkgs/desktops/kde-4.4/default.nix
View file

@ -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;

29
pkgs/desktops/kde-4.4/extragear/amarok/default.nix
View file

@ -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 ];
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -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;
};