alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #88016 from kini/amarok/lastfm-support

Browse source 
amarok: add last.fm support, bump version
This commit is contained in:
Dmitry Kalinkin 2020-06-15 10:34:38 -04:00 committed by GitHub
parent 67a080588c 557f56d465
commit d3044f0ec2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/audio/amarok/default.nix
View file

@ -3,21 +3,21 @@
, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine , qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem , karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
, fftw, phonon, plasma-framework, threadweaver , 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 { mkDerivation rec {
pname = "amarok"; pname = "amarok-unstable";
version = "2.9.0-20190824"; version = "2020-06-12";
src = fetchgit { src = fetchgit {
# master has the Qt5 version as of April 2018 but a formal release has not # 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 # yet been made so change this back to the proper upstream when such a
# release is out # 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"; # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
rev = "457fbda25a85a102bfda92aa7137e7ef5e4c8b00"; rev = "fece39b0e81db310b6a6e08f93d83b0d498cd02b";
sha256 = "1ig2mg8pqany6m2zplkrvldcv4ibxwsypnyv5igm7nz7ax82cd5j"; sha256 = "12casnq6w5yp2jlvnr466pjpkn0vriry8jzfq2qkjl564y0vhy9x";
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
@ -26,7 +26,7 @@ mkDerivation rec {
qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine
karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem
phonon plasma-framework threadweaver 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 pcre snappy taglib taglib_extras
]; ];

31
pkgs/development/libraries/liblastfm/default.nix
View file

@ -1,27 +1,24 @@
{ stdenv, fetchurl, pkgconfig, which, cmake { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, cmake
, fftwSinglePrec, libsamplerate, qtbase , fftwSinglePrec, libsamplerate, qtbase
, darwin }: , darwin }:
let version = "1.1.0"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "liblastfm"; pname = "liblastfm-unstable";
inherit version; version = "2019-08-23";
# Upstream does not package git tags as tarballs. Get tarball from github. src = fetchFromGitHub {
src = fetchurl { owner = "lastfm";
url = "https://github.com/lastfm/liblastfm/tarball/${version}"; repo = "liblastfm";
name = "${pname}-${version}.tar.gz"; rev = "2ce2bfe1879227af8ffafddb82b218faff813db9";
sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x"; sha256 = "1crih9xxf3rb109aqw12bjqv47z28lvlk2dpvyym5shf82nz6yd0";
}; };
postPatch = '' patches = [(fetchpatch {
substituteInPlace CMakeLists.txt \ url = "https://github.com/lastfm/liblastfm/commit/9c5d072b55f2863310e40291677e6397e9cbc3c2.patch";
--replace 'find_package(Qt5Core QUIET)' \ name = "0001-Remove-deprecated-staging-server-and-fix-test-for-QT5-at-Ubuntu-19.10.patch";
'find_package(Qt5 REQUIRED COMPONENTS Core Network Sql Test Xml)' sha256 = "04r14prydxshjgfws3pjajjmp2msszhjjs1mjh8s66yg29vq620l";
''; })];
prefixKey = "--prefix ";
nativeBuildInputs = [ pkgconfig which cmake ]; nativeBuildInputs = [ pkgconfig which cmake ];
buildInputs = [ fftwSinglePrec libsamplerate qtbase ] buildInputs = [ fftwSinglePrec libsamplerate qtbase ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
@ -31,7 +28,7 @@ stdenv.mkDerivation rec {
repositories.git = "git://github.com/lastfm/liblastfm.git"; repositories.git = "git://github.com/lastfm/liblastfm.git";
description = "Official LastFM library"; description = "Official LastFM library";
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.phreedom ]; maintainers = [ maintainers.phreedom ];
license = licenses.gpl3; license = licenses.gpl3;
}; };
} }

1
pkgs/top-level/aliases.nix
View file

@ -252,6 +252,7 @@ mapAliases ({
libjpeg_drop = libjpeg_original; # added 2020-06-05 libjpeg_drop = libjpeg_original; # added 2020-06-05
libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 liblapackWithoutAtlas = lapack-reference; # added 2018-11-05
liblastfm = libsForQt5.liblastfm; # added 2020-06-14
liblrdf = lrdf; # added 2018-04-25 liblrdf = lrdf; # added 2018-04-25
libqrencode = qrencode; # added 2019-01-01 libqrencode = qrencode; # added 2019-01-01
librdf = lrdf; # added 2020-03-22 librdf = lrdf; # added 2020-03-22

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

@ -13082,8 +13082,6 @@ in
liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; liblastfmSF = callPackage ../development/libraries/liblastfmSF { };
liblastfm = libsForQt5.callPackage ../development/libraries/liblastfm { };
liblcf = callPackage ../development/libraries/liblcf { }; liblcf = callPackage ../development/libraries/liblcf { };
liblqr1 = callPackage ../development/libraries/liblqr-1 { }; liblqr1 = callPackage ../development/libraries/liblqr-1 { };
@ -14357,6 +14355,8 @@ in
libktorrent = callPackage ../development/libraries/libktorrent { }; libktorrent = callPackage ../development/libraries/libktorrent { };
liblastfm = callPackage ../development/libraries/liblastfm { };
libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { }; libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { };
libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { };