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
This commit is contained in:
parent
4494574643
commit
fcf3fb06ac
@ -1,25 +1,28 @@
|
|||||||
{ lib, stdenv, fetchurl, imake, libXt, libXaw, libXtst
|
{ lib, stdenv, fetchurl, libXt, libXaw, libXtst
|
||||||
, libXi, libXpm, xorgproto, gccmakedep, Xaw3d }:
|
, libXi, libXpm, pkg-config, xorgproto, Xaw3d }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation rec {
|
||||||
pname = "xvkbd";
|
pname = "xvkbd";
|
||||||
version = "3.9";
|
version = "4.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.9.tar.gz";
|
url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-${version}.tar.gz";
|
||||||
sha256 = "17csj6x5zm3g67izfwhagkal1rbqzpw09lqmmlyrjy3vzgfkf75q";
|
sha256 = "1x5yldv9y99cw5hzzs73ygdn1z80zns9hz0baa355r711zghfbcm";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ imake gccmakedep ];
|
nativeBuildInputs = [ pkg-config ] ;
|
||||||
buildInputs = [ libXt libXaw libXtst xorgproto libXi Xaw3d libXpm ];
|
buildInputs = [ libXt libXaw libXtst xorgproto libXi Xaw3d libXpm ];
|
||||||
installTargets = [ "install" "install.man" ];
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"BINDIR=${placeholder "out"}/bin"
|
# avoid default libXt location
|
||||||
"CONFDIR=${placeholder "out"}/etc/X11"
|
"appdefaultdir=${placeholder "out"}/share/X11/app-defaults"
|
||||||
"LIBDIR=${placeholder "out"}/lib/X11"
|
"datarootdir=${placeholder "out"}/share"
|
||||||
"XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults"
|
|
||||||
"MANPATH=${placeholder "out"}/man"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
preInstall = ''
|
||||||
|
# workaround absence of libXt in $DESTDIR location.
|
||||||
|
mkdir -p $out/share/X11
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Virtual keyboard for X window system";
|
description = "Virtual keyboard for X window system";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
|
Loading…
Reference in New Issue
Block a user