From b703865f1757d716954aa31f1fbaabc52ed4e3b3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 18 Jun 2017 01:31:13 +0200 Subject: pkgs: Remove Tomahawk from the source tree Tomahawk is no longer actively developed and the current state within vuizvui is also broken. So after asking the users of brawndo and tyree whether they still use it they answered with a "no", so it doesn't make sense to fix up that package if noone is using it anyway. This has also been announced via the README in the official GitHub repository, where the change + comments can be seen here: https://github.com/tomahawk-player/tomahawk/commit/c8389592488c07079 Signed-off-by: aszlig --- pkgs/aszlig/default.nix | 1 - pkgs/aszlig/tomahawk/default.nix | 91 ---------------------------------------- 2 files changed, 92 deletions(-) delete mode 100644 pkgs/aszlig/tomahawk/default.nix (limited to 'pkgs/aszlig') diff --git a/pkgs/aszlig/default.nix b/pkgs/aszlig/default.nix index 50a2bcfb..7c042127 100644 --- a/pkgs/aszlig/default.nix +++ b/pkgs/aszlig/default.nix @@ -11,5 +11,4 @@ lockdev = callPackage ./lockdev { }; pvolctrl = callPackage ./pvolctrl { }; santander = callPackage_i686 ./santander { }; - tomahawk = callPackage ./tomahawk { boost = boost155; }; } diff --git a/pkgs/aszlig/tomahawk/default.nix b/pkgs/aszlig/tomahawk/default.nix deleted file mode 100644 index 8754bea1..00000000 --- a/pkgs/aszlig/tomahawk/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ stdenv, fetchFromGitHub, fetchurl, cmake, pkgconfig, boost, gnutls -, libechonest, liblastfm, lucenepp, kdeFrameworks, qt5, libsForQt5, sparsehash -, taglib, websocketpp, ffmpeg_2, v4l_utils, libtasn1, libidn, p11_kit - -, enableXMPP ? true, libjreen ? null -, enableKDE ? false, kdelibs ? null -, enableTelepathy ? false, telepathy_qt ? null -}: - -assert enableXMPP -> libjreen != null; -assert enableKDE -> kdelibs != null; -assert enableTelepathy -> telepathy_qt != null; - -with stdenv.lib; - -let - useQT5 = pkg: let - qt5variant = pkg.override (attrs: { - ${if attrs ? qt4 then "qt4" else "qt"} = qt5.qtbase; - }); - in qt5variant.overrideDerivation (drv: { - postInstall = (drv.postInstall or "") + '' - for i in "$out"/include/*; do - [ -d "$i" ] || continue - ! expr "$i" : '.*5$$' > /dev/null || continue - ln -sv "$i" "''${i}5" - done - for l in "$out"/lib*/*.so*; do - bn="$(basename "$l")" - ! expr "''${bn%.so*}" : '.*5$$' > /dev/null || continue - ln -sv "$l" "$(dirname "$l")/''${bn%.so*}5.''${bn#*.}" - done - ''; - }); - - libechonestQT5 = overrideDerivation ((useQT5 libechonest).override { - qjson = null; - }) (drv: { - cmakeFlags = (drv.cmakeFlags or []) ++ [ "-DBUILD_WITH_QT4=OFF" ]; - }); - - jreenPatched = overrideDerivation (useQT5 libjreen) (drv: { - postPatch = (drv.postPatch or "") + '' - sed -i -e 's/QMetaTypeId/QMap/g' src/stanzaextension.h - ''; - }); - -in stdenv.mkDerivation rec { - name = "tomahawk-${version}"; - version = "0.9.0-git"; - - src = fetchFromGitHub { - owner = "tomahawk-player"; - repo = "tomahawk"; - rev = "97a407f83701ee2343e4826043c311c03fe5675b"; - sha256 = "1palfsn8kz8q0xb19xhiwy3n993q2kifz9dy1ry5cnys7706l9b8"; - }; - - postPatch = '' - sed -i -e '/set(QUAZIP_LIB_VERSION_SUFFIX/d' CMakeModules/FindQuaZip.cmake - sed -i -e 's,quazip5/,quazip/,' src/libtomahawk/utils/TomahawkUtils.cpp - ''; - - cmakeFlags = [ - "-DLUCENEPP_INCLUDE_DIR=${lucenepp}/include" - "-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib" - ]; - - nativeBuildInputs = [ cmake pkgconfig kdeFrameworks.extra-cmake-modules ]; - - buildInputs = [ - libtasn1 libidn p11_kit - libsForQt5.attica libsForQt5.qca-qt5 libsForQt5.qtkeychain libsForQt5.quazip - libsForQt5.vlc qt5.qtbase qt5.qtsvg qt5.qttools qt5.qtwebkit qt5.qtx11extras - ] ++ map useQT5 [ liblastfm ] ++ [ - boost gnutls lucenepp sparsehash taglib websocketpp libechonestQT5 - ] ++ stdenv.lib.optional enableXMPP jreenPatched - ++ stdenv.lib.optional enableKDE (useQT5 kdelibs) - ++ stdenv.lib.optional enableTelepathy (useQT5 telepathy_qt); - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "A multi-source music player"; - homepage = "http://tomahawk-player.org/"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = [ maintainers.aszlig ]; - broken = true; - }; -} -- cgit 1.4.1