htop: add withVimKeys

Reference: https://github.com/NixOS/nixpkgs/issues/471645

pkgs/by-name/ht/htop-vim/package.nix

@@ -1,91 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  fetchpatch2,
-  stdenv,
-  autoreconfHook,
-  pkg-config,
-  ncurses,
-  libcap,
-  libnl,
-  sensorsSupport ? stdenv.hostPlatform.isLinux,
-  lm_sensors,
-  systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
-  systemdLibs,
-}:
-
-assert systemdSupport -> stdenv.hostPlatform.isLinux;
-
-stdenv.mkDerivation rec {
-  pname = "htop-vim";
-  version = "3.4.0";
-
-  src = fetchFromGitHub {
-    owner = "htop-dev";
-    repo = "htop-vim";
-    rev = version;
-    hash = "sha256-4M2Kzy/tTpIZzpyubnXWywQh7Np5InT4sYkVG2v6wWs";
-  };
-
-  patches = [
-    (fetchpatch2 {
-      name = "vim-keybindings.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/vim-keybindings.patch?h=htop-vim&id=d10f022b3ca1207200187a55f5b116a5bd8224f7";
-      hash = "sha256-fZDTA2dCOmXxUYD6Wm41q7TxL7fgQOj8a/8yJC7Zags=";
-    })
-  ];
-
-  # upstream removed pkg-config support and uses dlopen now
-  postPatch =
-    let
-      libnlPath = lib.getLib libnl;
-    in
-    lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace configure.ac \
-        --replace-fail /usr/include/libnl3 ${lib.getDev libnl}/include/libnl3
-      substituteInPlace linux/LibNl.c \
-        --replace-fail libnl-3.so ${libnlPath}/lib/libnl-3.so \
-        --replace-fail libnl-genl-3.so ${libnlPath}/lib/libnl-genl-3.so
-    '';
-
-  nativeBuildInputs = [ autoreconfHook ] ++ lib.optional stdenv.hostPlatform.isLinux pkg-config;
-
-  buildInputs = [
-    ncurses
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libcap
-    libnl
-  ]
-  ++ lib.optional sensorsSupport lm_sensors
-  ++ lib.optional systemdSupport systemdLibs;
-
-  configureFlags = [
-    "--enable-unicode"
-    "--sysconfdir=/etc"
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    "--enable-affinity"
-    "--enable-capabilities"
-    "--enable-delayacct"
-  ]
-  ++ lib.optional sensorsSupport "--enable-sensors";
-
-  postFixup =
-    let
-      optionalPatch = pred: so: lib.optionalString pred "patchelf --add-needed ${so} $out/bin/htop";
-    in
-    lib.optionalString (!stdenv.hostPlatform.isStatic) ''
-      ${optionalPatch sensorsSupport "${lib.getLib lm_sensors}/lib/libsensors.so"}
-      ${optionalPatch systemdSupport "${systemdLibs}/lib/libsystemd.so"}
-    '';
-
-  meta = {
-    description = "Interactive process viewer, with vim-style keybindings";
-    homepage = "https://aur.archlinux.org/packages/htop-vim";
-    license = lib.licenses.gpl2Only;
-    platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ thiagokokada ];
-    mainProgram = "htop";
-  };
-}

pkgs/by-name/ht/htop/package.nix

@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch2,
   stdenv,
   autoreconfHook,
   pkg-config,
@@ -11,21 +12,28 @@
   lm_sensors,
   systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
   systemdLibs,
+  withVimKeys ? false,
 }:
 
 assert systemdSupport -> stdenv.hostPlatform.isLinux;
 
-stdenv.mkDerivation rec {
-  pname = "htop";
+stdenv.mkDerivation (finalAttrs: {
+  pname = "htop" + lib.optionalString withVimKeys "-vim";
   version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "htop-dev";
     repo = "htop";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-fVqQwXbJus2IVE1Bzf3yJJpKK4qcZN/SCTX1XYkiHhU=";
   };
 
+  patches = lib.optional withVimKeys (fetchpatch2 {
+    name = "vim-keybindings.patch";
+    url = "https://aur.archlinux.org/cgit/aur.git/plain/vim-keybindings.patch?h=htop-vim&id=d10f022b3ca1207200187a55f5b116a5bd8224f7";
+    hash = "sha256-fZDTA2dCOmXxUYD6Wm41q7TxL7fgQOj8a/8yJC7Zags=";
+  });
+
   # upstream removed pkg-config support and uses dlopen now
   postPatch =
     let
@@ -72,16 +80,19 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    description = "Interactive process viewer";
-    homepage = "https://htop.dev";
+    description =
+      "Interactive process viewer" + lib.optionalString withVimKeys ", with vim-style keybindings";
+    homepage =
+      if withVimKeys then "https://aur.archlinux.org/packages/htop-vim" else "https://htop.dev";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [
       rob
       relrod
       SuperSandro2000
+      thiagokokada
     ];
-    changelog = "https://github.com/htop-dev/htop/blob/${version}/ChangeLog";
+    changelog = "https://github.com/htop-dev/htop/blob/${finalAttrs.version}/ChangeLog";
     mainProgram = "htop";
   };
-}
+})

pkgs/top-level/all-packages.nix

@@ -1061,6 +1061,8 @@ with pkgs;
     }
   );
 
+  htop-vim = htop.override { withVimKeys = true; };
+
   inherit (callPackages ../tools/networking/iroh/default.nix { })
     iroh-relay
     iroh-dns-server