From 44c1dfb32dc515e15d8a310429d3f5d61e193190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 27 Dec 2021 11:03:07 -0300 Subject: [PATCH] qt5ct: move to qt5-packages --- nixos/modules/programs/qt5ct.nix | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/qt5-packages.nix | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/programs/qt5ct.nix b/nixos/modules/programs/qt5ct.nix index 3f2bcf622836..88e861bf4031 100644 --- a/nixos/modules/programs/qt5ct.nix +++ b/nixos/modules/programs/qt5ct.nix @@ -26,6 +26,6 @@ with lib; ###### implementation config = mkIf config.programs.qt5ct.enable { environment.variables.QT_QPA_PLATFORMTHEME = "qt5ct"; - environment.systemPackages = with pkgs; [ qt5ct ]; + environment.systemPackages = with pkgs; [ libsForQt5.qt5ct ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dab34668b217..4ff990489380 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -770,6 +770,7 @@ mapAliases ({ qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # added 2021-04-02 qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02 + qt5ct = libsForQt5.qt5ct; # added 2021-12-27 quake3game = ioquake3; # added 2016-01-14 quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-03 qvim = throw "qvim has been removed."; # added 2020-08-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04b976989d40..c33fba89918d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19484,8 +19484,6 @@ with pkgs; # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop plasma5Packages = libsForQt515; - qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; - qtEnv = qt5.env; qt5Full = qt5.full; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index c80462d9d1ed..a2bd8dc6a547 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -194,6 +194,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea withQt5 = true; }; + qt5ct = callPackage ../tools/misc/qt5ct { }; + qtfeedback = callPackage ../development/libraries/qtfeedback { }; qtutilities = callPackage ../development/libraries/qtutilities { };