gromit-mpx: 1.6.0 -> 1.7.0, refactor (#343538)

pkgs/by-name/gr/gromit-mpx/package.nix

@@ -0,0 +1,70 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  gtk3,
+  glib,
+  pcre,
+  libappindicator-gtk3,
+  libpthreadstubs,
+  xorg,
+  libxkbcommon,
+  libepoxy,
+  at-spi2-core,
+  dbus,
+  libdbusmenu,
+  lz4,
+  wrapGAppsHook3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gromit-mpx";
+  version = "1.7.0";
+
+  src = fetchFromGitHub {
+    owner = "bk138";
+    repo = "gromit-mpx";
+    rev = finalAttrs.version;
+    hash = "sha256-jHw4V2ZvfpT3PUihe/O+9BPsv+udFg5seMbYmxOz8Yk=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    gtk3
+    glib
+    pcre
+    libappindicator-gtk3
+    libpthreadstubs
+    xorg.libXdmcp
+    libxkbcommon
+    libepoxy
+    at-spi2-core
+    dbus
+    libdbusmenu
+    lz4
+  ];
+
+  meta = with lib; {
+    description = "Desktop annotation tool";
+    longDescription = ''
+      Gromit-MPX (GRaphics Over MIscellaneous Things) is a small tool
+      to make annotations on the screen.
+    '';
+    homepage = "https://github.com/bk138/gromit-mpx";
+    changelog = "https://github.com/bk138/gromit-mpx/blob/${finalAttrs.version}/NEWS.md";
+    maintainers = with maintainers; [
+      pjones
+      gepbird
+    ];
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
+    mainProgram = "gromit-mpx";
+  };
+})

pkgs/tools/graphics/gromit-mpx/default.nix

@@ -1,39 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
-, gtk, glib, pcre, libappindicator, libpthreadstubs, xorg
-, libxkbcommon, libepoxy, at-spi2-core, dbus, libdbusmenu
-, wrapGAppsHook3
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gromit-mpx";
-  version = "1.6.0";
-
-  src = fetchFromGitHub {
-    owner = "bk138";
-    repo = "gromit-mpx";
-    rev = version;
-    sha256 = "sha256-olDQGw0qDWwXpqRopVoEPDXLRpFiiBo+/jiVeL7R6QA=";
-  };
-
-  nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ];
-  buildInputs = [
-    gtk glib pcre libappindicator libpthreadstubs
-    xorg.libXdmcp libxkbcommon libepoxy at-spi2-core
-    dbus libdbusmenu
-  ];
-
-  meta = with lib; {
-    description = "Desktop annotation tool";
-
-    longDescription = ''
-      Gromit-MPX (GRaphics Over MIscellaneous Things) is a small tool
-      to make annotations on the screen.
-    '';
-
-    homepage = "https://github.com/bk138/gromit-mpx";
-    maintainers = with maintainers; [ pjones ];
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
-    mainProgram = "gromit-mpx";
-  };
-}

pkgs/top-level/all-packages.nix

@@ -8127,11 +8127,6 @@ with pkgs;
 
   groff = callPackage ../tools/text/groff { };
 
-  gromit-mpx = callPackage ../tools/graphics/gromit-mpx {
-    gtk = gtk3;
-    libappindicator = libappindicator-gtk3;
-  };
-
   gron = callPackage ../development/tools/gron { };
 
   groonga = callPackage ../servers/search/groonga { };