From d60f81e8c10144599d3691ec84f4d46c559dd214 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 26 May 2022 03:21:36 +0200 Subject: [PATCH 1/4] qjson: qt4 -> qt5 --- pkgs/development/libraries/qjson/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index a6ee272a38b5..7ab0d8c1ae7e 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9a20d8406cd..589567338bef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20159,7 +20159,7 @@ with pkgs; qimageblitz = callPackage ../development/libraries/qimageblitz {}; - qjson = callPackage ../development/libraries/qjson { }; + qjson = libsForQt5.callPackage ../development/libraries/qjson { }; qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; From c2e15baf0437c0125286eba7a92a3293eda0cc86 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 26 May 2022 03:22:23 +0200 Subject: [PATCH 2/4] libechonest: remove --- .../libraries/libechonest/default.nix | 39 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 41 deletions(-) delete mode 100644 pkgs/development/libraries/libechonest/default.nix diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix deleted file mode 100644 index 6f160bdb6dcc..000000000000 --- a/pkgs/development/libraries/libechonest/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 589567338bef..32c304cb6bb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18571,8 +18571,6 @@ with pkgs; icu = icu67; }; - libechonest = callPackage ../development/libraries/libechonest { }; - libemf2svg = callPackage ../development/libraries/libemf2svg { }; libev = callPackage ../development/libraries/libev { }; From 0129fe117334b61060778b1d8ad997dcda837c40 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 26 May 2022 03:25:00 +0200 Subject: [PATCH 3/4] clementine: build without qt4 --- pkgs/applications/audio/clementine/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index a7f58e0d68bb..aa6c862641a4 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/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 From a212889d9ab3f50fc4449fa1cacffba10f181509 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 26 May 2022 17:02:55 +0200 Subject: [PATCH 4/4] qjson: move to qt5-packages --- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/qt5-packages.nix | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32c304cb6bb8..3626906d4342 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20157,8 +20157,6 @@ with pkgs; qimageblitz = callPackage ../development/libraries/qimageblitz {}; - qjson = libsForQt5.callPackage ../development/libraries/qjson { }; - qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; qt4 = qt48; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 770cf9011200..270766f36511 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/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; };