Merge pull request #203573 from trofi/tightvnc-without-xlibsWrapper
tightvnc: use xorg.* packages directly instead of xlibsWrapper indire…
This commit is contained in:
commit
57dc6891f7
1 changed files with 30 additions and 4 deletions
|
@ -1,5 +1,20 @@
|
|||
{ lib, stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu
|
||||
, libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, zlib
|
||||
, libjpeg
|
||||
, imake
|
||||
, gccmakedep
|
||||
, libXaw
|
||||
, libXext
|
||||
, libXmu
|
||||
, libXp
|
||||
, libXpm
|
||||
, perl
|
||||
, xauth
|
||||
, fontDirectories
|
||||
, openssh
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tightvnc";
|
||||
|
@ -22,8 +37,19 @@ stdenv.mkDerivation rec {
|
|||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
buildInputs = [ xlibsWrapper zlib libjpeg imake gccmakedep libXmu libXaw
|
||||
libXpm libXp xauth openssh ];
|
||||
buildInputs = [
|
||||
zlib
|
||||
libjpeg
|
||||
imake
|
||||
gccmakedep
|
||||
libXaw
|
||||
libXext
|
||||
libXmu
|
||||
libXp
|
||||
libXpm
|
||||
xauth
|
||||
openssh
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
fontPath=
|
||||
|
|
Loading…
Reference in a new issue