neovim-qt: move to pkgs/by-name

* neovim-qt: move to pkgs/by-name

pkgs/by-name/ne/neovim-qt-unwrapped/package.nix

@@ -1,6 +1,6 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, msgpack, neovim, python3Packages, qtbase, qtsvg }:
+{ stdenv, lib, libsForQt5, fetchFromGitHub, cmake, doxygen, msgpack, neovim, python3Packages }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "neovim-qt-unwrapped";
   version = "0.2.18";
 
@@ -16,16 +16,16 @@ mkDerivation rec {
     "-DENABLE_TESTS=0"  # tests fail because xcb platform plugin is not found
   ];
 
+  nativeBuildInputs = [ cmake doxygen libsForQt5.wrapQtAppsHook ];
+
   buildInputs = [
     neovim.unwrapped # only used to generate help tags at build time
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
   ] ++ (with python3Packages; [
     jinja2 python msgpack
   ]);
 
-  nativeBuildInputs = [ cmake doxygen ];
-
   preCheck = ''
     # The GUI tests require a running X server, disable them
     sed -i ../test/CMakeLists.txt -e '/^add_xtest_gui/d'

pkgs/by-name/ne/neovim-qt/package.nix

@@ -1,9 +1,9 @@
-{ stdenv, makeWrapper, neovim, neovim-qt-unwrapped }:
+{ stdenv, libsForQt5, makeWrapper, neovim, neovim-qt-unwrapped }:
 
 let
   unwrapped = neovim-qt-unwrapped;
 in
-stdenv.mkDerivation {
+libsForQt5.mkDerivation {
   pname = "neovim-qt";
   version = unwrapped.version;
   buildCommand = if stdenv.isDarwin then ''

pkgs/top-level/all-packages.nix

@@ -35052,9 +35052,6 @@ with pkgs;
 
   neovim-gtk = callPackage ../applications/editors/neovim/neovim-gtk.nix { };
 
-  neovim-qt-unwrapped = libsForQt5.callPackage ../applications/editors/neovim/neovim-qt.nix { };
-  neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { };
-
   gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim { };
 
   gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { };