diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2017-05-07 09:37:42 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2017-05-07 09:38:42 +0100 |
commit | 63b294eb0c4b20c58d54e6eb2ffcb3166d6d3521 (patch) | |
tree | 549ba596feca3288bbef926c00abe70f3666ab9e /pkgs | |
parent | f79a5fc30d6611c672bb5863e8c653ec3cb76835 (diff) | |
download | nixlib-63b294eb0c4b20c58d54e6eb2ffcb3166d6d3521.tar nixlib-63b294eb0c4b20c58d54e6eb2ffcb3166d6d3521.tar.gz nixlib-63b294eb0c4b20c58d54e6eb2ffcb3166d6d3521.tar.bz2 nixlib-63b294eb0c4b20c58d54e6eb2ffcb3166d6d3521.tar.lz nixlib-63b294eb0c4b20c58d54e6eb2ffcb3166d6d3521.tar.xz nixlib-63b294eb0c4b20c58d54e6eb2ffcb3166d6d3521.tar.zst nixlib-63b294eb0c4b20c58d54e6eb2ffcb3166d6d3521.zip |
tigervnc: 1.8.0pre20170211 -> 1.8.0pre20170419
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 54 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 28 insertions, 32 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 60d2b2bcd111..3df01dccced8 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,27 +1,29 @@ -{ stdenv, fetchFromGitHub, xorg -, autoconf, automake, cvs, libtool, nasm, pixman, xkeyboard_config -, fontDirectories, libgcrypt, gnutls, pam, flex, bison, gettext -, cmake, libjpeg_turbo, fltk, nettle, libiconv, libtasn1 -}: +{ stdenv, fetchFromGitHub +, xorg, xkeyboard_config, zlib +, libjpeg_turbo, pixman, fltk +, fontDirectories +, cmake, gettext, libtool +, glproto, mesa_glu +, gnutls, pam, nettle +, xterm }: with stdenv.lib; stdenv.mkDerivation rec { - version = "1.8.0pre20170211"; + version = "1.8.0pre20170419"; name = "tigervnc-${version}"; src = fetchFromGitHub { owner = "TigerVNC"; repo = "tigervnc"; - sha256 = "10bs6394ya953gmak8g2d3n133vyfrryq9zq6dc27g8s6lw0mrbh"; - rev = "b6c46a1a99a402d5d17b1afafc4784ce0958d6ec"; + sha256 = "1y3fn7dwlkm7ilqn8bwyqj3bw7s7clnv7d4jml4wyvfihzz9j90b"; + rev = "v1.7.90"; }; inherit fontDirectories; patchPhase = '' - sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.crossDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am - sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.crossDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver + sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver fontPath= for i in $fontDirectories; do for j in $(find $i -name fonts.dir); do @@ -67,27 +69,23 @@ stdenv.mkDerivation rec { make TIGERVNC_SRCDIR=`pwd`/../.. install popd rm -f $out/lib/xorg/protocol.txt - ''; - crossAttrs = { - buildInputs = (map (x : x.crossDrv) (buildInputs ++ [ - xorg.fixesproto xorg.damageproto xorg.xcmiscproto xorg.bigreqsproto xorg.randrproto xorg.renderproto - xorg.fontsproto xorg.videoproto xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto - xorg.libxkbfile xorg.libXfont xorg.libpciaccess xorg.xineramaproto - ])); - }; + wrapProgram $out/bin/vncserver \ + --prefix PATH : ${stdenv.lib.makeBinPath (with xorg; [ xterm twm xsetroot ]) } + ''; - buildInputs = - [ xorg.libX11 xorg.libXext gettext xorg.libICE xorg.libXtst xorg.libXi xorg.libSM xorg.libXft - nasm libgcrypt gnutls pam pixman libjpeg_turbo fltk xorg.xineramaproto - xorg.libXinerama xorg.libXcursor nettle libiconv libtasn1 - ]; + buildInputs = with xorg; [ + libjpeg_turbo fltk pixman + gnutls pam nettle + fixesproto damageproto compositeproto randrproto + xcmiscproto bigreqsproto randrproto renderproto + fontsproto videoproto scrnsaverproto resourceproto presentproto + utilmacros libXtst libXext libX11 libXext libICE libXi libSM libXft + libxkbfile libXfont2 libpciaccess xineramaproto + glproto mesa_glu + ] ++ xorgserver.buildInputs; - nativeBuildInputs = - [ autoconf automake cvs xorg.utilmacros xorg.fontutil libtool flex bison - cmake gettext - ] - ++ xorg.xorgserver.nativeBuildInputs; + nativeBuildInputs = [ cmake zlib gettext libtool ] ++ xorg.xorgserver.nativeBuildInputs; propagatedNativeBuildInputs = xorg.xorgserver.propagatedNativeBuildInputs; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0431da86bb42..dfba83589fff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4504,9 +4504,7 @@ with pkgs; tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; tigervnc = callPackage ../tools/admin/tigervnc { - fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc - xorg.fontbhlucidatypewriter75dpi ]; - fltk = fltk13; + fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; }; tightvnc = callPackage ../tools/admin/tightvnc { @@ -11386,7 +11384,7 @@ with pkgs; b43Firmware_6_30_163_46 = callPackage ../os-specific/linux/firmware/b43-firmware/6.30.163.46.nix { }; b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { }; - + bt-fw-converter = callPackage ../os-specific/linux/firmware/bt-fw-converter { }; broadcom-bt-firmware = callPackage ../os-specific/linux/firmware/broadcom-bt-firmware { }; |