diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-28 22:26:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-28 22:26:48 -0400 |
commit | fde2e021007869e9908e65fb7c5988bdd37c3b2c (patch) | |
tree | 20638c0e22a6e2ef0425aea67a9965b9d69ebe15 /pkgs/applications/audio | |
parent | 1c0b6ebe2c103751a86a9e753c639e623b75d417 (diff) | |
parent | a0c36e9f183fc03eae027118b1ed10e18d4668bc (diff) | |
download | nixlib-fde2e021007869e9908e65fb7c5988bdd37c3b2c.tar nixlib-fde2e021007869e9908e65fb7c5988bdd37c3b2c.tar.gz nixlib-fde2e021007869e9908e65fb7c5988bdd37c3b2c.tar.bz2 nixlib-fde2e021007869e9908e65fb7c5988bdd37c3b2c.tar.lz nixlib-fde2e021007869e9908e65fb7c5988bdd37c3b2c.tar.xz nixlib-fde2e021007869e9908e65fb7c5988bdd37c3b2c.tar.zst nixlib-fde2e021007869e9908e65fb7c5988bdd37c3b2c.zip |
Merge pull request #42639 from peterhoeg/u/amarok
amarok: 2.8.91-20170228 -> 2.9.0-20180618
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/amarok/default.nix | 42 | ||||
-rw-r--r-- | pkgs/applications/audio/amarok/kf5.nix | 40 | ||||
-rw-r--r-- | pkgs/applications/audio/amarok/qt5_11.patch | 11 |
3 files changed, 42 insertions, 51 deletions
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix new file mode 100644 index 000000000000..855d31aadbb0 --- /dev/null +++ b/pkgs/applications/audio/amarok/default.nix @@ -0,0 +1,42 @@ +{ mkDerivation, fetchgit, lib +, extra-cmake-modules, kdoctools +, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine +, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem +, fftw, phonon, plasma-framework, threadweaver +, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras +}: + +let + pname = "amarok"; + version = "2.9.0-20180618"; + +in mkDerivation { + name = "${pname}-${version}"; + + 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 = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + rev = "5d43efa454b6a6c9c833a6f3d7f8ff3cae738c96"; + sha256 = "0fyrbgldg4wbb2darm4aav5fpzbacxzfjrdqwkhv9xr13j7zsvm3"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + propagatedBuildInputs = [ + qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine + karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem + phonon plasma-framework threadweaver + curl fftw ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static + pcre snappy taglib taglib_extras + ]; + + enableParallelBuilding = true; + + meta = with lib; { + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix deleted file mode 100644 index 461fc260207d..000000000000 --- a/pkgs/applications/audio/amarok/kf5.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ mkDerivation, fetchgit, lib -, extra-cmake-modules, kdoctools -, qca-qt5, qjson, qtscript, qtwebkit -, kcmutils, kconfig, kdelibs4support, kdnssd, kinit, knewstuff, knotifyconfig, ktexteditor -, phonon, plasma-framework, threadweaver -, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras -}: - -let - pname = "amarok"; - version = "2.8.91-20170228"; - -in mkDerivation { - name = "${pname}-${version}"; - - src = fetchgit { - url = git://anongit.kde.org/amarok.git; - # go back to the KDE mirror when kf5 is merged into master - # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - rev = "323e2d5b43245c4c06e0b83385d37ef0d32920cb"; - sha256 = "05w7kl6qfmkjz0y1bhgkkbmsqdll30bkjd6npkzvivrvp7dplmbh"; - }; - - patches = [ ./qt5_11.patch ]; - - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - qca-qt5 qjson qtscript qtwebkit - kcmutils kconfig kdelibs4support kdnssd kinit knewstuff knotifyconfig ktexteditor - phonon plasma-framework threadweaver - curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static - pcre snappy taglib taglib_extras - ]; - enableParallelBuilding = true; - - meta = with lib; { - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/applications/audio/amarok/qt5_11.patch b/pkgs/applications/audio/amarok/qt5_11.patch deleted file mode 100644 index 36041c136c8b..000000000000 --- a/pkgs/applications/audio/amarok/qt5_11.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/aboutdialog/ExtendedAboutDialog.cpp -+++ b/src/aboutdialog/ExtendedAboutDialog.cpp -@@ -30,6 +30,7 @@ - #include <QLayout> - #include <QPushButton> - #include <QScrollBar> -+#include <QStyle> - #include <QTabWidget> - - #include <qapplication.h> - |