git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #164170 from kraem/kraem/ydotool_1.0.1

ydotool: unstable-2021-01-20 -> 1.0.1

commitbc6a2728bdce6512de49c78c6456535a2f07f4c7 authorRenaud <c0bw3b@users.noreply.github.com> dateThu 17 Mar 2022, 15:25 (5 years ago) parent877eb10df715ae
2 files changed+7−80
pkgs/tools/wayland/ydotool/default.nix+7−22 pkgs/tools/wayland/ydotool/fixup-cmakelists.patch−58
pkgs/tools/wayland/ydotool/default.nix+7−22
@@ -1,41 +1,26 @@
1−{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, boost, libevdevplus, libuinputplus, iodash, cxxopts}:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, scdoc }:
22
33stdenv.mkDerivation rec {
44 pname = "ydotool";
5− version = "unstable-2021-01-20";
5+ version = "1.0.1";
66
77 src = fetchFromGitHub {
88 owner = "ReimuNotMoe";
99 repo = "ydotool";
10− rev = "b1d041f52f7bac364d6539b1251d29c3b77c0f37";
11− sha256 = "1gzdbx6fv0dbcyia3yyzhv93az2gf90aszb9kcj5cnxywfpv9w9g";
10+ rev = "v${version}";
11+ sha256 = "sha256-maXXGCqB8dkGO8956hsKSwM4HQdYn6z1jBFENQ9sKcA=";
1212 };
1313
14− # upstream decided to use a cpp package manager called cpm.
15− # we need to disable that because it wants networking, furthermore,
16− # it does some system folder creating which also needs to be disabled.
17− # Both changes are to respect the sandbox.
18− patches = [ ./fixup-cmakelists.patch ];
19−
20−
21− # cxxopts is a header only library.
22− # See pull request: https://github.com/ReimuNotMoe/ydotool/pull/105
23− postPatch = ''
24− substituteInPlace CMakeLists.txt --replace \
25− "PUBLIC cxxopts" \
26− "PUBLIC"
27− '';
28−
2914 nativeBuildInputs = [ cmake pkg-config ];
3015 buildInputs = [
31− boost libevdevplus libuinputplus iodash cxxopts
16+ scdoc
3217 ];
3318
3419 meta = with lib; {
3520 inherit (src.meta) homepage;
3621 description = "Generic Linux command-line automation tool";
37− license = licenses.mit;
38− maintainers = with maintainers; [ willibutz ];
22+ license = licenses.agpl3Plus;
23+ maintainers = with maintainers; [ willibutz kraem ];
3924 platforms = with platforms; linux;
4025 };
4126}
pkgs/tools/wayland/ydotool/fixup-cmakelists.patchdeleted−58
@@ -1,58 +0,0 @@
1−From bb8bc44d22060cd1215712117cf30eae09f4f6ba Mon Sep 17 00:00:00 2001
2−From: Jappie Klooster <jappieklooster@hotmail.com>
3−Date: Fri, 2 Apr 2021 14:04:14 -0400
4−Subject: [PATCH] Fixup cmaklists
5−
6−We remove cpm, which is a package manager for c++,
7−which requires networking, so it's better just deleted.
8−
9−Furthermore we delete the adddirectory statements.
10−These want to modify directories outside of the sandbox.
11−---
12− CMakeLists.txt | 26 --------------------------
13− 1 file changed, 26 deletions(-)
14−
15−diff --git a/CMakeLists.txt b/CMakeLists.txt
16−index b5e8789..b797538 100644
17−--- a/CMakeLists.txt
18−+++ b/CMakeLists.txt
19−@@ -13,30 +13,6 @@ endif()
20−
21− include(${CPM_DOWNLOAD_LOCATION})
22−
23−-CPMAddPackage(
24−- NAME IODash
25−- GITHUB_REPOSITORY YukiWorkshop/IODash
26−- VERSION 0.1.0
27−-)
28−-
29−-CPMAddPackage(
30−- NAME libevdevPlus
31−- GITHUB_REPOSITORY YukiWorkshop/libevdevPlus
32−- VERSION 0.2.1
33−-)
34−-
35−-CPMAddPackage(
36−- NAME libuInputPlus
37−- GITHUB_REPOSITORY YukiWorkshop/libuInputPlus
38−- VERSION 0.2.1
39−-)
40−-
41−-CPMAddPackage(
42−- NAME cxxopts
43−- GITHUB_REPOSITORY jarro2783/cxxopts
44−- VERSION 3.0.0
45−- GIT_TAG 2d8e17c4f88efce80e274cb03eeb902e055a91d3
46−-)
47−
48− set(SOURCE_FILES_LIBRARY
49− CommonIncludes.hpp
50−@@ -74,5 +50,3 @@ add_executable(ydotool ${SOURCE_FILES_CLIENT})
51− target_link_libraries(ydotool ydotool_library dl pthread uInputPlus evdevPlus)
52− install(TARGETS ydotool DESTINATION ${CMAKE_INSTALL_BINDIR})
53−
54−-add_subdirectory(Daemon)
55−-add_subdirectory(manpage)
56−--
57−2.29.2
58−