lol

xvkbd: 3.9 -> 4.1

Upstream moved from imake to autoconf.
Also fixes build against gcc-10 -fno-common.

Changes: http://t-sato.in.coocan.jp/xvkbd/ChangeLog

authored by

Sergei Trofimovich and committed by
Benno Fünfstück
fcf3fb06 44945746

+16 -13
+16 -13
pkgs/tools/X11/xvkbd/default.nix
··· 1 - { lib, stdenv, fetchurl, imake, libXt, libXaw, libXtst 2 - , libXi, libXpm, xorgproto, gccmakedep, Xaw3d }: 1 + { lib, stdenv, fetchurl, libXt, libXaw, libXtst 2 + , libXi, libXpm, pkg-config, xorgproto, Xaw3d }: 3 3 4 - stdenv.mkDerivation { 4 + stdenv.mkDerivation rec { 5 5 pname = "xvkbd"; 6 - version = "3.9"; 6 + version = "4.1"; 7 7 src = fetchurl { 8 - url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.9.tar.gz"; 9 - sha256 = "17csj6x5zm3g67izfwhagkal1rbqzpw09lqmmlyrjy3vzgfkf75q"; 8 + url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-${version}.tar.gz"; 9 + sha256 = "1x5yldv9y99cw5hzzs73ygdn1z80zns9hz0baa355r711zghfbcm"; 10 10 }; 11 11 12 - nativeBuildInputs = [ imake gccmakedep ]; 12 + nativeBuildInputs = [ pkg-config ] ; 13 13 buildInputs = [ libXt libXaw libXtst xorgproto libXi Xaw3d libXpm ]; 14 - installTargets = [ "install" "install.man" ]; 14 + 15 15 makeFlags = [ 16 - "BINDIR=${placeholder "out"}/bin" 17 - "CONFDIR=${placeholder "out"}/etc/X11" 18 - "LIBDIR=${placeholder "out"}/lib/X11" 19 - "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" 20 - "MANPATH=${placeholder "out"}/man" 16 + # avoid default libXt location 17 + "appdefaultdir=${placeholder "out"}/share/X11/app-defaults" 18 + "datarootdir=${placeholder "out"}/share" 21 19 ]; 20 + 21 + preInstall = '' 22 + # workaround absence of libXt in $DESTDIR location. 23 + mkdir -p $out/share/X11 24 + ''; 22 25 23 26 meta = with lib; { 24 27 description = "Virtual keyboard for X window system";