diff options
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r-- | pkgs/tools/X11/opentabletdriver/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/X11/opentabletdriver/deps.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/X11/xnee/default.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/X11/xvkbd/default.nix | 29 | ||||
-rw-r--r-- | pkgs/tools/X11/xwinmosaic/default.nix | 12 |
5 files changed, 42 insertions, 19 deletions
diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index a8ba509c78c9a..3b631c22d15d3 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -19,13 +19,13 @@ buildDotnetModule rec { pname = "OpenTabletDriver"; - version = "0.6.0.3"; + version = "0.6.0.4"; src = fetchFromGitHub { owner = "OpenTabletDriver"; repo = "OpenTabletDriver"; rev = "v${version}"; - sha256 = "sha256-/Tow25ycQEK8HN1IaB12ZXCXEsuKItD+aYLF/IX8Eos="; + sha256 = "sha256-VvxW8Ck+XC4nXSUyDhcbGoeSr5uSAZ66jtZNoADuVR8="; }; debPkg = fetchurl { diff --git a/pkgs/tools/X11/opentabletdriver/deps.nix b/pkgs/tools/X11/opentabletdriver/deps.nix index 8ead5fc8a1180..f0b5252950067 100644 --- a/pkgs/tools/X11/opentabletdriver/deps.nix +++ b/pkgs/tools/X11/opentabletdriver/deps.nix @@ -20,6 +20,7 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) @@ -27,7 +28,6 @@ (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.4"; sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.4"; sha256 = "14110qzmypr72ywvx3npq7mf4n0gvdr4536v91z1xbapms65am6x"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; }) diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 00ebb1ecec23e..d2236dfe354eb 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libX11, xorgproto, libXext, libXtst +{ fetchurl, fetchpatch, lib, stdenv, libX11, xorgproto, libXext, libXtst , gtk2, libXi, pkg-config, texinfo }: stdenv.mkDerivation rec { @@ -10,7 +10,17 @@ stdenv.mkDerivation rec { sha256 = "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j"; }; - patchPhase = + patches = [ + # Pull fix pending upstream inclusion for -fno-common + # toolchain support: https://savannah.gnu.org/bugs/?58810 + (fetchpatch { + name = "fno-common.patch"; + url = "https://savannah.gnu.org/bugs/download.php?file_id=49534"; + sha256 = "04j2cjy2yaiigg31a6k01vw0fq19yj3zpriikkjcz9q4ab4m5gh2"; + }) + ]; + + postPatch = '' for i in `find cnee/test -name \*.sh` do sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g' diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index d751cb8f087a7..32355205d59a9 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -1,25 +1,28 @@ -{ lib, stdenv, fetchurl, imake, libXt, libXaw, libXtst -, libXi, libXpm, xorgproto, gccmakedep, Xaw3d }: +{ lib, stdenv, fetchurl, libXt, libXaw, libXtst +, libXi, libXpm, pkg-config, xorgproto, Xaw3d }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xvkbd"; - version = "3.9"; + version = "4.1"; src = fetchurl { - url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.9.tar.gz"; - sha256 = "17csj6x5zm3g67izfwhagkal1rbqzpw09lqmmlyrjy3vzgfkf75q"; + url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-${version}.tar.gz"; + sha256 = "1x5yldv9y99cw5hzzs73ygdn1z80zns9hz0baa355r711zghfbcm"; }; - nativeBuildInputs = [ imake gccmakedep ]; + nativeBuildInputs = [ pkg-config ] ; buildInputs = [ libXt libXaw libXtst xorgproto libXi Xaw3d libXpm ]; - installTargets = [ "install" "install.man" ]; + makeFlags = [ - "BINDIR=${placeholder "out"}/bin" - "CONFDIR=${placeholder "out"}/etc/X11" - "LIBDIR=${placeholder "out"}/lib/X11" - "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" - "MANPATH=${placeholder "out"}/man" + # avoid default libXt location + "appdefaultdir=${placeholder "out"}/share/X11/app-defaults" + "datarootdir=${placeholder "out"}/share" ]; + preInstall = '' + # workaround absence of libXt in $DESTDIR location. + mkdir -p $out/share/X11 + ''; + meta = with lib; { description = "Virtual keyboard for X window system"; longDescription = '' diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index af17f3ade7dc4..51ba815f1de45 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkg-config, libXdamage }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, gtk2, cmake, pkg-config, libXdamage }: stdenv.mkDerivation rec { version = "0.4.2"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains like upstream gcc-10: + # https://github.com/soulthreads/xwinmosaic/pull/33 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/soulthreads/xwinmosaic/commit/a193a3f30850327066e5a93b29316cba2735e10d.patch"; + sha256 = "0qpk802j5x6bsfvj6jqw1nz482jynwyk7yrrh4bsziwc53khm95q"; + }) + ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ gtk2 libXdamage ]; |