Unverified Commit 57dc6891 authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by GitHub
Browse files

Merge pull request #203573 from trofi/tightvnc-without-xlibsWrapper 

tightvnc: use xorg.* packages directly instead of xlibsWrapper indire…
parents 8f43020c ec992804

pkgs/tools/admin/tightvnc/default.nix

+30 −4
Original line number Diff line number Diff line 
{ 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=