Skip to content

amarok: add last.fm support, bump version #88016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
veprbl merged 2 commits into from
Jun 15, 2020
Merged

amarok: add last.fm support, bump version #88016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2f945b
amarok: 2.9.0-20190824 -> amarok-unstable 2020-06-12
kini May 17, 2020
557f56d
liblastfm: 1.1.0 -> liblastfm-unstable 2019-08-23
kini Jun 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pkgs/applications/audio/amarok/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
, fftw, phonon, plasma-framework, threadweaver
, curl, ffmpeg_3, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
, curl, ffmpeg_3, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
}:

mkDerivation rec {
pname = "amarok";
version = "2.9.0-20190824";
pname = "amarok-unstable";
version = "2020-06-12";

src = fetchgit {
# master has the Qt5 version as of April 2018 but a formal release has not
# yet been made so change this back to the proper upstream when such a
# release is out
url = "git://anongit.kde.org/amarok.git";
url = "https://invent.kde.org/multimedia/amarok.git";
# url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
rev = "457fbda25a85a102bfda92aa7137e7ef5e4c8b00";
sha256 = "1ig2mg8pqany6m2zplkrvldcv4ibxwsypnyv5igm7nz7ax82cd5j";
rev = "fece39b0e81db310b6a6e08f93d83b0d498cd02b";
sha256 = "12casnq6w5yp2jlvnr466pjpkn0vriry8jzfq2qkjl564y0vhy9x";
};

nativeBuildInputs = [ extra-cmake-modules kdoctools ];
Expand All @@ -26,7 +26,7 @@ mkDerivation rec {
qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine
karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem
phonon plasma-framework threadweaver
curl fftw ffmpeg_3 gdk-pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
curl fftw ffmpeg_3 gdk-pixbuf libaio liblastfm libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
pcre snappy taglib taglib_extras
];

Expand Down
31 changes: 14 additions & 17 deletions pkgs/development/libraries/liblastfm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
{ stdenv, fetchurl, pkgconfig, which, cmake
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, cmake
, fftwSinglePrec, libsamplerate, qtbase
, darwin }:

let version = "1.1.0"; in

stdenv.mkDerivation rec {
pname = "liblastfm";
inherit version;
pname = "liblastfm-unstable";
version = "2019-08-23";

# Upstream does not package git tags as tarballs. Get tarball from github.
src = fetchurl {
url = "https://github.com/lastfm/liblastfm/tarball/${version}";
name = "${pname}-${version}.tar.gz";
sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x";
src = fetchFromGitHub {
owner = "lastfm";
repo = "liblastfm";
rev = "2ce2bfe1879227af8ffafddb82b218faff813db9";
sha256 = "1crih9xxf3rb109aqw12bjqv47z28lvlk2dpvyym5shf82nz6yd0";
};

postPatch = ''
substituteInPlace CMakeLists.txt \
--replace 'find_package(Qt5Core QUIET)' \
'find_package(Qt5 REQUIRED COMPONENTS Core Network Sql Test Xml)'
'';
patches = [(fetchpatch {
url = "https://github.com/lastfm/liblastfm/commit/9c5d072b55f2863310e40291677e6397e9cbc3c2.patch";
name = "0001-Remove-deprecated-staging-server-and-fix-test-for-QT5-at-Ubuntu-19.10.patch";
sha256 = "04r14prydxshjgfws3pjajjmp2msszhjjs1mjh8s66yg29vq620l";
})];

prefixKey = "--prefix ";
nativeBuildInputs = [ pkgconfig which cmake ];
buildInputs = [ fftwSinglePrec libsamplerate qtbase ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
Expand All @@ -31,7 +28,7 @@ stdenv.mkDerivation rec {
repositories.git = "git://github.com/lastfm/liblastfm.git";
description = "Official LastFM library";
platforms = platforms.unix;
maintainers = [ maintainers.phreedom ];
maintainers = [ maintainers.phreedom ];
license = licenses.gpl3;
};
}
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ mapAliases ({
libjpeg_drop = libjpeg_original; # added 2020-06-05
libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
liblapackWithoutAtlas = lapack-reference; # added 2018-11-05
liblastfm = libsForQt5.liblastfm; # added 2020-06-14
liblrdf = lrdf; # added 2018-04-25
libqrencode = qrencode; # added 2019-01-01
librdf = lrdf; # added 2020-03-22
Expand Down
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13074,8 +13074,6 @@ in

liblastfmSF = callPackage ../development/libraries/liblastfmSF { };

liblastfm = libsForQt5.callPackage ../development/libraries/liblastfm { };

liblcf = callPackage ../development/libraries/liblcf { };

liblqr1 = callPackage ../development/libraries/liblqr-1 { };
Expand Down Expand Up @@ -14349,6 +14347,8 @@ in

libktorrent = callPackage ../development/libraries/libktorrent { };

liblastfm = callPackage ../development/libraries/liblastfm { };

libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { };

libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { };
Expand Down