diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-06 09:53:08 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-06 09:53:08 +0100 |
| commit | 528664e3bb33bae66d4ce41877fe573395010dd9 (patch) | |
| tree | d324f345bee9408253768c7bfb5dc2db9f2831e0 /pkgs/tools/admin | |
| parent | e5381cdeceeb150535998cee5518e6fa678e4dc0 (diff) | |
| parent | a4250d14784e318f44d084095f9a41aa4375105b (diff) | |
| download | nixpkgs-528664e3bb33bae66d4ce41877fe573395010dd9.tar nixpkgs-528664e3bb33bae66d4ce41877fe573395010dd9.tar.gz nixpkgs-528664e3bb33bae66d4ce41877fe573395010dd9.tar.bz2 nixpkgs-528664e3bb33bae66d4ce41877fe573395010dd9.tar.lz nixpkgs-528664e3bb33bae66d4ce41877fe573395010dd9.tar.xz nixpkgs-528664e3bb33bae66d4ce41877fe573395010dd9.tar.zst nixpkgs-528664e3bb33bae66d4ce41877fe573395010dd9.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 317646501ca..37a0f47c7af 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -3,7 +3,7 @@ , libjpeg_turbo, pixman, fltk , fontDirectories , cmake, gettext, libtool -, glproto, libGLU +, libGLU , gnutls, pam, nettle , xterm, openssh , makeWrapper}: @@ -80,13 +80,11 @@ stdenv.mkDerivation rec { buildInputs = with xorg; [ libjpeg_turbo fltk pixman gnutls pam nettle - fixesproto damageproto compositeproto randrproto - xcmiscproto bigreqsproto randrproto renderproto - fontsproto videoproto scrnsaverproto resourceproto presentproto + xorgproto utilmacros libXtst libXext libX11 libXext libICE libXi libSM libXft - libxkbfile libXfont2 libpciaccess xineramaproto - glproto libGLU - ] ++ xorgserver.buildInputs; + libxkbfile libXfont2 libpciaccess + libGLU + ] ++ xorg.xorgserver.buildInputs; nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil makeWrapper ] ++ xorg.xorgserver.nativeBuildInputs; |