From a212889d9ab3f50fc4449fa1cacffba10f181509 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 26 May 2022 17:02:55 +0200 Subject: [PATCH] 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 32c304cb6bb..3626906d434 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 770cf901120..270766f3651 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; };