From 6fcc794d278e31e8e93a9607e102770520566e01 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 3 Dec 2022 14:00:18 +0000
Subject: [PATCH 1/2] gv: add explicit libXext build depend

A preparation to remove xlibsWrapper from Xaw3d's propagatedbuildInputs.
---
 pkgs/applications/misc/gv/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix
index d5aa1ac88179..ca12e3bc77a9 100644
--- a/pkgs/applications/misc/gv/default.nix
+++ b/pkgs/applications/misc/gv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkg-config, libiconv }:
+{ lib, stdenv, fetchurl, libXext, Xaw3d, ghostscriptX, perl, pkg-config, libiconv }:
 
 stdenv.mkDerivation rec {
   pname = "gv";
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
+    libXext
     Xaw3d
     ghostscriptX
     perl

From 90c066a6db7cc3e52a9df19fc4308dee6e434928 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 3 Dec 2022 13:25:00 +0000
Subject: [PATCH 2/2] Xaw3d: use xorg.* packages directly instead of
 xlibsWrapper indirection

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

diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix
index 3ec220ca80de..f358a59ad62d 100644
--- a/pkgs/development/libraries/Xaw3d/default.nix
+++ b/pkgs/development/libraries/Xaw3d/default.nix
@@ -6,10 +6,12 @@
 , bison
 , flex
 , pkg-config
-, xlibsWrapper
+, libXext
 , libXmu
 , libXpm
 , libXp
+, libXt
+, xorgproto
 }:
 
 stdenv.mkDerivation rec {
@@ -22,8 +24,8 @@ stdenv.mkDerivation rec {
   };
   dontUseImakeConfigure = true;
   nativeBuildInputs = [ pkg-config bison flex imake gccmakedep ];
-  buildInputs = [ libXpm libXp ];
-  propagatedBuildInputs = [ xlibsWrapper libXmu ];
+  buildInputs = [ libXext libXpm libXp ];
+  propagatedBuildInputs = [ libXmu libXt xorgproto ];
 
   meta = with lib; {
     description = "3D widget set based on the Athena Widget set";