From 9b23334289bad2dee05b55269c52b0f9ce49e18d Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <886074+teto@users.noreply.github.com>
Date: Tue, 18 Jun 2024 10:40:23 +0200
Subject: [PATCH] neovim-qt: move to pkgs/by-name

* neovim-qt: move to pkgs/by-name
---
 .../ne/neovim-qt-unwrapped/package.nix}              | 12 ++++++------
 .../qt.nix => by-name/ne/neovim-qt/package.nix}      |  4 ++--
 pkgs/top-level/all-packages.nix                      |  3 ---
 3 files changed, 8 insertions(+), 11 deletions(-)
 rename pkgs/{applications/editors/neovim/neovim-qt.nix => by-name/ne/neovim-qt-unwrapped/package.nix} (80%)
 rename pkgs/{applications/editors/neovim/qt.nix => by-name/ne/neovim-qt/package.nix} (90%)

diff --git a/pkgs/applications/editors/neovim/neovim-qt.nix b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
similarity index 80%
rename from pkgs/applications/editors/neovim/neovim-qt.nix
rename to pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
index 75067585653b..0cd07e2711bc 100644
--- a/pkgs/applications/editors/neovim/neovim-qt.nix
+++ b/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'
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/by-name/ne/neovim-qt/package.nix
similarity index 90%
rename from pkgs/applications/editors/neovim/qt.nix
rename to pkgs/by-name/ne/neovim-qt/package.nix
index 728c364d4006..aa7b2607fb70 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/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 ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b78d8d58d28..162736e7dc48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/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 { };