Merge pull request #204293 from trofi/Xaw3d-without-xlibsWrapper

Xaw3d: use xorg.* packages directly instead of xlibsWrapper indirection

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

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";