From 77a820e18a5c4739fd93b85bea8c5d0d26dde94a Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 31 Mar 2024 16:02:08 -0300
Subject: [PATCH 1/3] fvwm2: migrate to by-name

---
 .../fvwm/2.6.nix => by-name/fv/fvwm2/package.nix}               | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{applications/window-managers/fvwm/2.6.nix => by-name/fv/fvwm2/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/fvwm/2.6.nix b/pkgs/by-name/fv/fvwm2/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/fvwm/2.6.nix
rename to pkgs/by-name/fv/fvwm2/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54e8e2b60fc3..2bcfbc1d94cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31075,7 +31075,7 @@ with pkgs;
   };
 
   fvwm = fvwm2;
-  fvwm2 = callPackage ../applications/window-managers/fvwm/2.6.nix { };
+
   fvwm3 = callPackage ../applications/window-managers/fvwm/3.nix { };
 
   ganttproject-bin = callPackage ../applications/misc/ganttproject-bin {

From c7ccaa7154cf44a58682d2e4857b4f132667fe1f Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 31 Mar 2024 16:05:50 -0300
Subject: [PATCH 2/3] fvwm3: migrate to by-name

---
 .../window-managers/fvwm/3.nix => by-name/fv/fvwm3/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/fvwm/3.nix => by-name/fv/fvwm3/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/by-name/fv/fvwm3/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/fvwm/3.nix
rename to pkgs/by-name/fv/fvwm3/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bcfbc1d94cc..2d529a24e07a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31076,8 +31076,6 @@ with pkgs;
 
   fvwm = fvwm2;
 
-  fvwm3 = callPackage ../applications/window-managers/fvwm/3.nix { };
-
   ganttproject-bin = callPackage ../applications/misc/ganttproject-bin {
     jre = openjdk17.override {
       enableJavaFX = true;

From b5b4992ef96b5ef4f441dccd8252f6783c7b8ac9 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 31 Mar 2024 16:10:52 -0300
Subject: [PATCH 3/3] fvwm3: refactor

- use lib.enableFeature
- strictDeps
- get rid of nested with
- meta.longDescription
- meta.changelog
---
 pkgs/by-name/fv/fvwm3/package.nix | 35 +++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/fv/fvwm3/package.nix b/pkgs/by-name/fv/fvwm3/package.nix
index 83dffa020008..043f46a37f41 100644
--- a/pkgs/by-name/fv/fvwm3/package.nix
+++ b/pkgs/by-name/fv/fvwm3/package.nix
@@ -1,9 +1,8 @@
 { lib
-, stdenv
-, fetchFromGitHub
 , asciidoctor
 , autoreconfHook
 , cairo
+, fetchFromGitHub
 , fontconfig
 , freetype
 , fribidi
@@ -27,6 +26,7 @@
 , python3Packages
 , readline
 , sharutils
+, stdenv
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   configureFlags = [
-    "--enable-mandoc"
+    (lib.enableFeature true "mandoc")
   ];
 
   postFixup = ''
@@ -87,11 +87,34 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  strictDeps = true;
+
+  meta = {
     homepage = "http://fvwm.org";
     description = "A multiple large virtual desktop window manager - Version 3";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
+    longDescription = ''
+      Fvwm is a virtual window manager for the X windows system. It was
+      originally a feeble fork of TWM by Robert Nation in 1993 (fvwm history),
+      and has evolved into the fantastic, fabulous, famous, flexible, and so on,
+      window manager we have today.
+
+      Fvwm is a ICCCM/EWMH compliant and highly configurable floating window
+      manager built primarily using Xlib. Fvwm is configured using a
+      configuration file, which is used to configure most aspects of the window
+      manager including window looks, key bindings, menus, window behavior,
+      additional modules, and more. There is a default configuration file that
+      can be used as a starting point for writing one's own configuration file.
+
+      Fvwm is a light weight window manager and can be configured to be anything
+      from a small sleek window manager to a full featured desktop
+      environment. To get the most out of fvwm, one should be willing to read
+      the documents, and take the time to write a custom configuration file that
+      suites their needs. The manual pages and the fvwm wiki can be used to help
+      learn how to configure fvwm.
+    '';
+    changelog = "https://github.com/fvwmorg/fvwm3/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
     inherit (libX11.meta) platforms;
   };
 })