From 4950b3c98d53db5d3f30ac3dfae55f399186342a Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Wed, 29 Oct 2025 02:27:28 +0000 Subject: [PATCH] qjournalctl: migrate to pkgs/by-name --- .../default.nix => by-name/qj/qjournalctl/package.nix} | 10 ++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 8 deletions(-) rename pkgs/{applications/system/qjournalctl/default.nix => by-name/qj/qjournalctl/package.nix} (90%) diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/by-name/qj/qjournalctl/package.nix similarity index 90% rename from pkgs/applications/system/qjournalctl/default.nix rename to pkgs/by-name/qj/qjournalctl/package.nix index 4e4bbafa37ad..85fd6af3fe6d 100644 --- a/pkgs/applications/system/qjournalctl/default.nix +++ b/pkgs/by-name/qj/qjournalctl/package.nix @@ -2,11 +2,9 @@ lib, stdenv, fetchFromGitHub, - qtbase, - qmake, pkg-config, libssh, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation rec { @@ -25,14 +23,14 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - qmake + libsForQt5.qmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ libssh - qtbase + libsForQt5.qtbase ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcdf19681d64..7e2cf4d6e68c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3857,8 +3857,6 @@ with pkgs; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; - qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { }; - qjoypad = libsForQt5.callPackage ../tools/misc/qjoypad { }; qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { };