Merge pull request #118256 from djwf/fvwm

fvwm: add readline, fix man build, refactor fetch

pkgs/applications/window-managers/fvwm/default.nix

@@ -1,27 +1,37 @@
-{ gestures ? false
+{ autoreconfHook, enableGestures ? false, lib, stdenv, fetchFromGitHub
-, lib, stdenv, fetchurl, pkg-config
+, pkg-config, cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
-, cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
+, libXpm, libXt, librsvg, libpng, fribidi, perl, libstroke, readline, libxslt }:
-, libXpm, libXt, librsvg, libpng, fribidi, perl
-, libstroke ? null
-}:
-
-assert gestures -> libstroke != null;
 
 stdenv.mkDerivation rec {
   pname = "fvwm";
   version = "2.6.9";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${pname}-${version}.tar.gz";
+    owner = "fvwmorg";
-    sha256 = "1bliqcnap7vb3m2rn8wvxyfhbf35h9x34s41fl4301yhrkrlrihv";
+    repo = pname;
+    rev = version;
+    sha256 = "14jwckhikc9n4h93m00pzjs7xm2j0dcsyzv3q5vbcnknp6p4w5dh";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [
-    cairo fontconfig freetype
+    cairo
-    libXft libXcursor libXinerama libXpm libXt
+    fontconfig
-    librsvg libpng fribidi perl
+    freetype
-  ] ++ lib.optional gestures libstroke;
+    libXft
+    libXcursor
+    libXinerama
+    libXpm
+    libXt
+    librsvg
+    libpng
+    fribidi
+    perl
+    readline
+    libxslt
+  ] ++ lib.optional enableGestures libstroke;
+
+  configureFlags = [ "--enable-mandoc" "--disable-htmldoc" ];
 
   meta = {
     homepage = "http://fvwm.org";