Merge pull request #125910 from myguidingstar/patch-1

interception-tools: 0.2.1 -> 0.6.6
This commit is contained in:
Sandro 2021-06-07 02:39:04 +02:00 committed by GitHub
commit 2cb5b58180
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 47 deletions

View file

@ -1,19 +1,18 @@
{ lib, stdenv, fetchurl, pkg-config, cmake, libyamlcpp,
libevdev, udev }:
{ lib, stdenv, fetchFromGitLab, pkg-config, cmake, libyamlcpp,
libevdev, udev, boost }:
let
version = "0.2.1";
baseName = "interception-tools";
in stdenv.mkDerivation {
name = "${baseName}-${version}";
src = fetchurl {
url = "https://gitlab.com/interception/linux/tools/repository/v${version}/archive.tar.gz";
sha256 = "0lqz89wsf9r5xdgflincysxg4l8fpgg5z8zczhhrg9s5787srfzi";
stdenv.mkDerivation rec {
pname = "interception-tools";
version = "0.6.6";
src = fetchFromGitLab {
owner = "interception/linux";
repo = "tools";
rev = "v${version}";
sha256 = "0k9h14a9d65nwvv7pj0kigjgzfv453mm3r4svnxfg1h5lccmy8jj";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libevdev udev libyamlcpp ];
buildInputs = [ libevdev udev libyamlcpp boost ];
prePatch = ''
substituteInPlace CMakeLists.txt --replace \
@ -21,12 +20,10 @@ in stdenv.mkDerivation {
"\"$(pkg-config --cflags libevdev | cut -c 3-)\""
'';
patches = [ ./fix-udevmon-configuration-job-path.patch ];
meta = {
description = "A minimal composable infrastructure on top of libudev and libevdev";
homepage = "https://gitlab.com/interception/linux/tools";
license = lib.licenses.gpl3;
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.vyp ];
platforms = lib.platforms.linux;
};

View file

@ -1,32 +0,0 @@
From d3a5d661b80f3597368f517ebaeddfdfaafc1bf2 Mon Sep 17 00:00:00 2001
From: xd1le <elisp.vim@gmail.com>
Date: Mon, 28 Aug 2017 00:19:09 +1000
Subject: [PATCH] fix udevmon configuration job path
For some reason, the udevmon job $PATH seems to be empty (or otherwise
seems to point to `/no-such-path`). This commit fixes that by setting
its $PATH to the same $PATH that the parent udevmon process has.
---
udevmon.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/udevmon.cpp b/udevmon.cpp
index ebdd909..b523efd 100644
--- a/udevmon.cpp
+++ b/udevmon.cpp
@@ -237,8 +237,11 @@ private:
case 0: {
char *command[] = {(char *)"sh", (char *)"-c",
(char *)job.c_str(), nullptr};
+ std::string path = getenv("PATH");
std::string variables = "DEVNODE=" + devnode;
- char *environment[] = {(char *)variables.c_str(), nullptr};
+ std::string pathenv = "PATH=" + path;
+ char *environment[] = {(char *)variables.c_str(),
+ (char *)pathenv.c_str(), nullptr};
execvpe(command[0], command, environment);
std::fprintf(stderr,
R"(exec failed for devnode %s, job "%s" )"
--
2.14.1