From 6ccdbd9acc0dd312b552e997c0579d37bc7655b7 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:29:24 +0000
Subject: [PATCH] qtrvsim: migrate to pkgs/by-name

---
 .../qtrvsim/default.nix => by-name/qt/qtrvsim/package.nix} | 7 +++----
 pkgs/top-level/all-packages.nix                            | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{applications/science/computer-architecture/qtrvsim/default.nix => by-name/qt/qtrvsim/package.nix} (90%)

diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/by-name/qt/qtrvsim/package.nix
similarity index 90%
rename from pkgs/applications/science/computer-architecture/qtrvsim/default.nix
rename to pkgs/by-name/qt/qtrvsim/package.nix
index 19e76f532765..52f3379e2057 100644
--- a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix
+++ b/pkgs/by-name/qt/qtrvsim/package.nix
@@ -3,8 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,10 +19,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   meta = with lib; {
     description = "RISC-V CPU simulator for education purposes";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 636f1331465a..e8213ae1a10f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14374,8 +14374,6 @@ with pkgs;
 
   qmake2cmake = python3Packages.callPackage ../tools/misc/qmake2cmake { };
 
-  qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { };
-
   sail-riscv = callPackage ../applications/virtualization/sail-riscv {
     inherit (ocamlPackages) sail;
   };