From 973a043a4a064b0b3ee6757291859076662c3a38 Mon Sep 17 00:00:00 2001 From: ckie Date: Thu, 8 Jun 2023 19:38:52 +0300 Subject: [PATCH] x2x: 1.27 -> unstable-2023-04-30 --- pkgs/tools/X11/x2x/default.nix | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix index f473344ad38c..3a766d63ba97 100644 --- a/pkgs/tools/X11/x2x/default.nix +++ b/pkgs/tools/X11/x2x/default.nix @@ -1,25 +1,18 @@ -{ lib, stdenv, fetchurl, imake, libX11, libXtst, libXext, gccmakedep }: +{ lib, stdenv, libX11, libXtst, libXext, fetchFromGitHub, autoreconfHook, pkg-config, libXi }: stdenv.mkDerivation rec { pname = "x2x"; - version = "1.27"; + version = "unstable-2023-04-30"; - src = fetchurl { - url = "https://github.com/downloads/dottedmag/x2x/x2x-${version}.tar.gz"; - sha256 = "0dha0kn1lbc4as0wixsvk6bn4innv49z9a0sm5wlx4q1v0vzqzyj"; + src = fetchFromGitHub { + owner = "dottedmag"; + repo = pname; + rev = "53692798fa0e991e0dd67cdf8e8126158d543d08"; + hash = "sha256-FUl2z/Yz9uZlUu79LHdsXZ6hAwSlqwFV35N+GYDNvlQ="; }; - nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ libX11 libXtst libXext ]; - - hardeningDisable = [ "format" ]; - - buildFlags = [ "x2x" ]; - - installPhase = '' - install -D x2x $out/bin/x2x - install -D x2x.1 $out/man/man1/x2x.1 - ''; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libX11 libXtst libXext libXi ]; meta = with lib; { description = "Allows the keyboard, mouse on one X display to be used to control another X display";