Merge pull request #204011 from trofi/lesstif-without-xlibsWrapper

lesstif: use xorg.* packages directly instead of xlibsWrapper indirec…
This commit is contained in:
Sergei Trofimovich 2022-12-02 07:11:51 +00:00 committed by GitHub
commit 493b788ccf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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