From 2f685ba86f859872be88426a983964fe29f9ec00 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 1 Dec 2022 22:08:04 +0000
Subject: [PATCH] lesstif: use xorg.* packages directly instead of xlibsWrapper
 indirection

Validated as no change in `out` output with `diffoscope`.
---
 .../development/libraries/lesstif/default.nix | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index dc0c8c0ed741..a5c37dd0f04f 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -1,4 +1,15 @@
-{lib, stdenv, fetchurl, xlibsWrapper, libXp, libXau}:
+{ lib
+, stdenv
+, fetchurl
+, freetype
+, fontconfig
+, libICE
+, libX11
+, libXp
+, libXau
+, libXext
+, libXt
+}:
 
 stdenv.mkDerivation rec {
   pname = "lesstif";
@@ -7,8 +18,18 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/lesstif/${pname}-${version}.tar.bz2";
     sha256 = "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb";
   };
-  buildInputs = [xlibsWrapper];
-  propagatedBuildInputs = [libXp libXau];
+  buildInputs = [
+    freetype
+    fontconfig
+    libICE
+    libX11
+    libXext
+    libXt
+  ];
+  propagatedBuildInputs = [
+    libXau
+    libXp
+  ];
 
   # These patches fix a number of later issues - in particular the
   # render_table_crash shows up in 'arb'. The same patches appear