diff options
author | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-08-21 20:39:32 +0300 |
---|---|---|
committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-08-21 20:41:07 +0300 |
commit | b2c4b68a386db5b9b595355883fc3c31cd12d539 (patch) | |
tree | 9d4efc0b51710e686fee5d343c7c710155b0ba5e /pkgs | |
parent | b25bcf853f45c648f9456f62239c96a2865edee0 (diff) | |
download | nixlib-b2c4b68a386db5b9b595355883fc3c31cd12d539.tar nixlib-b2c4b68a386db5b9b595355883fc3c31cd12d539.tar.gz nixlib-b2c4b68a386db5b9b595355883fc3c31cd12d539.tar.bz2 nixlib-b2c4b68a386db5b9b595355883fc3c31cd12d539.tar.lz nixlib-b2c4b68a386db5b9b595355883fc3c31cd12d539.tar.xz nixlib-b2c4b68a386db5b9b595355883fc3c31cd12d539.tar.zst nixlib-b2c4b68a386db5b9b595355883fc3c31cd12d539.zip |
Amarok: update to 2.8.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/audio/amarok/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/audio/amarok/find-mysql.patch | 46 |
2 files changed, 5 insertions, 51 deletions
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 6e20acab5239..f45ca59e0ea0 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl , libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon -, strigi, soprano, qjson, ffmpeg, libofa }: +, strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "amarok"; - version = "2.7.1"; + version = "2.8.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "12dvqnx6jniykbi6sz94xxlnxzafjsaxlf0mppk9w5wn61jwc3cy"; + sha256 = "1ilf9wdp3wna5pmvxill8x08rb9gw86qkc2zwm3xk9hpy8l9pf7l"; }; QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; - patches = ./find-mysql.patch; + buildInputs = [ qtscriptgenerator stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi - soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa ]; + soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa nepomuk_core ]; cmakeFlags = "-DKDE4_BUILD_TESTS=OFF"; diff --git a/pkgs/applications/audio/amarok/find-mysql.patch b/pkgs/applications/audio/amarok/find-mysql.patch deleted file mode 100644 index 57a5ec46b84f..000000000000 --- a/pkgs/applications/audio/amarok/find-mysql.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 9979970f05f25329100168d85a5c4cdc8c084b7a -Author: Yury G. Kudryashov <urkud.urkud@gmail.com> -Date: Thu Aug 30 12:32:53 2012 +0400 - - FindMySQLAmarok.cmake: use PATH_SUFFIXES - -diff --git a/cmake/modules/FindMySQLAmarok.cmake b/cmake/modules/FindMySQLAmarok.cmake -index 910b434..4c8b8e8 100644 ---- a/cmake/modules/FindMySQLAmarok.cmake -+++ b/cmake/modules/FindMySQLAmarok.cmake -@@ -13,18 +13,17 @@ - # For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - if(NOT WIN32) -- find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 PATHS ${BIN_INSTALL_DIR} ~/usr/bin /usr/local/bin) -+ find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 HINTS ${BIN_INSTALL_DIR}) - endif(NOT WIN32) - - find_path(MYSQL_INCLUDE_DIR mysql.h -- /opt/local/include/mysql5/mysql -+ PATHS -+ /opt/local/include - /opt/mysql/mysql/include -- /opt/mysqle/include/mysql -- /opt/ports/include/mysql5/mysql -- /usr/include/mysql -- /usr/local/include/mysql -- /usr/mysql/include/mysql -- ~/usr/include/mysql -+ /opt/mysqle/include -+ /opt/ports/include -+ /usr/mysql/include -+ PATH_SUFFIXES mysql mysql5/mysql - ) - - if(MYSQLCONFIG_EXECUTABLE) -@@ -40,8 +39,7 @@ if(MYSQLCONFIG_EXECUTABLE) - - find_library(MYSQLD_PIC_SEPARATE - mysqld_pic -- PATHS -- /usr/lib/mysql -+ PATH_SUFFIXES mysql - ) - - if(MYSQLD_PIC_SEPARATE) |