diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/by-name/ap/appcsxcad/package.nix
similarity index 58%
rename from pkgs/applications/science/electronics/appcsxcad/default.nix
rename to pkgs/by-name/ap/appcsxcad/package.nix
index 36b029b5f0dc..ae9504c3d2fa 100644
--- a/pkgs/applications/science/electronics/appcsxcad/default.nix
+++ b/pkgs/by-name/ap/appcsxcad/package.nix
@@ -1,40 +1,42 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
   csxcad,
   qcsxcad,
   hdf5,
-  vtkWithQt5,
-  qtbase,
+  vtkWithQt6,
+  qt6,
   fparser,
   tinyxml,
   cgal,
   boost,
 }:
 
-mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "appcsxcad";
-  version = "unstable-2023-01-06";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "thliebig";
     repo = "AppCSXCAD";
-    rev = "379ede4b8e00c11e8d0fb724c35547991b30c423";
-    hash = "sha256-L0ZEyovnfMzM7JuITBuhb4tJ2Aqgw52IiKEfEGq7Yo0=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-KrsnCnRZRTbkgEH3hOETrYhseg5mCHPqhAbYyHlS3sk=";
   };
 
   nativeBuildInputs = [
     cmake
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
     csxcad
     qcsxcad
     hdf5
-    vtkWithQt5
-    qtbase
+    vtkWithQt6
+    qt6.qtbase
+    qt6.qtwayland
     fparser
     tinyxml
     cgal
@@ -45,12 +47,12 @@ mkDerivation {
     rm $out/bin/AppCSXCAD.sh
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Minimal Application using the QCSXCAD library";
     mainProgram = "AppCSXCAD";
     homepage = "https://github.com/thliebig/AppCSXCAD";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ matthuszagh ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ matthuszagh ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/qc/qcsxcad/package.nix b/pkgs/by-name/qc/qcsxcad/package.nix
new file mode 100644
index 000000000000..8d8b0fc4dfcc
--- /dev/null
+++ b/pkgs/by-name/qc/qcsxcad/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  csxcad,
+  tinyxml,
+  vtkWithQt6,
+  qt6,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "qcsxcad";
+  version = "0.6.3";
+
+  src = fetchFromGitHub {
+    owner = "thliebig";
+    repo = "QCSXCAD";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-bX6e3ugHJynU9tP70BV8TadnoGg1VO7SAYJueMkMAyo=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_RPATH" false)
+  ];
+
+  buildInputs = [
+    csxcad
+    tinyxml
+    vtkWithQt6
+    qt6.qtbase
+    qt6.qt5compat
+    qt6.qtwayland
+  ];
+
+  dontWrapQtApps = true;
+
+  meta = {
+    description = "Qt library for CSXCAD";
+    homepage = "https://github.com/thliebig/QCSXCAD";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ matthuszagh ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/development/libraries/science/electronics/qcsxcad/default.nix b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix
deleted file mode 100644
index 25d739f739de..000000000000
--- a/pkgs/development/libraries/science/electronics/qcsxcad/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchFromGitHub,
-  cmake,
-  csxcad,
-  tinyxml,
-  vtkWithQt5,
-  qtbase,
-}:
-
-mkDerivation {
-  pname = "qcsxcad";
-  version = "unstable-2023-01-06";
-
-  src = fetchFromGitHub {
-    owner = "thliebig";
-    repo = "QCSXCAD";
-    rev = "1cde9d560a5000f4c24c249d2dd5ccda12de38b6";
-    hash = "sha256-kc9Vnx6jGiQC2K88ZH00b61D/DbWxAIZZwYCsINqtrY=";
-  };
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  cmakeFlags = [
-    "-DCSXCAD_ROOT_DIR=${csxcad}"
-    "-DENABLE_RPATH=OFF"
-  ];
-
-  buildInputs = [
-    csxcad
-    tinyxml
-    vtkWithQt5
-    qtbase
-  ];
-
-  meta = with lib; {
-    description = "Qt library for CSXCAD";
-    homepage = "https://github.com/thliebig/QCSXCAD";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ matthuszagh ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b15a1d6370c6..839044f332d3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2043,7 +2043,6 @@ mapAliases {
 
   qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30
   qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
-  qcsxcad = throw "'qcsxcad' has been renamed to/replaced by 'libsForQt5.qcsxcad'"; # Converted to throw 2024-10-17
   qflipper = qFlipper; # Added 2022-02-11
   qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26
   qscintilla = libsForQt5.qscintilla; # Added 2023-09-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a22e6e96f0d..0a6dc406c57f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14717,8 +14717,6 @@ with pkgs;
 
   ### SCIENCE / ELECTRONICS
 
-  appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { };
-
   simulide_0_4_15 = callPackage ../by-name/si/simulide/package.nix { versionNum = "0.4.15"; };
   simulide_1_0_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.0.0"; };
   simulide_1_1_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.1.0"; };
@@ -14776,9 +14774,7 @@ with pkgs;
     withNgshared = false;
   };
 
-  openems = callPackage ../applications/science/electronics/openems {
-    qcsxcad = libsForQt5.qcsxcad;
-  };
+  openems = callPackage ../applications/science/electronics/openems { };
 
   xyce-parallel = callPackage ../by-name/xy/xyce/package.nix {
     withMPI = true;
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index f216e398f8b0..d65f6c3da347 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -165,8 +165,6 @@ makeScopeWithSplicing' {
 
         qcoro = callPackage ../development/libraries/qcoro { };
 
-        qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { };
-
         qcustomplot = callPackage ../development/libraries/qcustomplot { };
 
         qjson = callPackage ../development/libraries/qjson { };