Merge pull request #174646 from helsinki-systems/qjson-qt5

qjson: qt4 -> qt5, clementine: build without qt4 & remove libechonest

pkgs/applications/audio/clementine/default.nix

@@ -23,12 +23,11 @@
 , libpulseaudio
 , gvfs
 , libcdio
-, libechonest
 , libspotify
 , pcre
 , projectm
 , protobuf
-, qca2
+, qca-qt5
 , pkg-config
 , sparsehash
 , config
@@ -87,13 +86,12 @@ let
     gst_all_1.gst-plugins-bad
     gst_all_1.gstreamer
     gvfs
-    libechonest
     liblastfm
     libpulseaudio
     pcre
     projectm
     protobuf
-    qca2
+    qca-qt5
     qjson
     qtbase
     qtx11extras

pkgs/development/libraries/libechonest/default.nix

@@ -1,39 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }:
-
-stdenv.mkDerivation rec {
-  pname = "libechonest";
-  version = "2.3.1";
-
-  src = fetchFromGitHub {
-    owner = "lfranchi";
-    repo = pname;
-    rev = version;
-    sha256 = "0xbavf9f355dl1d3qv59x4ryypqrdanh9xdvw2d0q66l008crdkq";
-  };
-
-  # Fix build with GCC 11.
-  NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
-
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/lfranchi/libechonest/commit/009514f65044823ef29045397d4b58dd04d09977.patch";
-      sha256 = "0dmmpi7hixdngwiv045ilqrzyzkf56xpfyihcsx5i3xya2m0mynx";
-    })
-    (fetchpatch {
-      url = "https://github.com/lfranchi/libechonest/commit/3ce779536d56a163656e8098913f923e6cda2b5c.patch";
-      sha256 = "1vasd3sgqah562vxk71jibyws5cbihjjfnffd50qvdm2xqgvbx94";
-    })
-  ];
-
-  nativeBuildInputs = [ cmake doxygen ];
-  buildInputs = [ qt4 qjson ];
-
-  doCheck = false; # requires network access
-
-  meta = {
-    description = "A C++/Qt wrapper around the Echo Nest API";
-    homepage = "https://projects.kde.org/projects/playground/libs/libechonest";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.unix;
-  };
-}

pkgs/development/libraries/qjson/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, qt4 }:
+{ lib, stdenv, fetchFromGitHub, cmake, qtbase }:
 
 stdenv.mkDerivation rec {
   version = "0.9.0";
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ qt4 ];
+  buildInputs = [ qtbase ];
+  dontWrapQtApps = true;
 
   meta = with lib; {
     description = "Lightweight data-interchange format";
     homepage = "http://qjson.sourceforge.net/";
     license = licenses.lgpl21;
-    inherit (qt4.meta) platforms;
   };
 }

pkgs/top-level/all-packages.nix

@@ -18577,8 +18577,6 @@ with pkgs;
     icu = icu67;
   };
 
-  libechonest = callPackage ../development/libraries/libechonest { };
-
   libemf2svg = callPackage ../development/libraries/libemf2svg { };
 
   libev = callPackage ../development/libraries/libev { };
@@ -20165,8 +20163,6 @@ with pkgs;
 
   qimageblitz = callPackage ../development/libraries/qimageblitz {};
 
-  qjson = callPackage ../development/libraries/qjson { };
-
   qolibri = libsForQt5.callPackage ../applications/misc/qolibri { };
 
   qt4 = qt48;

pkgs/top-level/qt5-packages.nix

@@ -181,6 +181,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
 
   qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { };
 
+  qjson = callPackage ../development/libraries/qjson { };
+
   qmltermwidget = callPackage ../development/libraries/qmltermwidget {
     inherit (pkgs.darwin.apple_sdk.libs) utmp;
   };