diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/wayland/ydotool')
| -rw-r--r-- | nixpkgs/pkgs/tools/wayland/ydotool/default.nix | 35 | ||||
| -rw-r--r-- | nixpkgs/pkgs/tools/wayland/ydotool/fixup-cmakelists.patch | 58 |
2 files changed, 11 insertions, 82 deletions
diff --git a/nixpkgs/pkgs/tools/wayland/ydotool/default.nix b/nixpkgs/pkgs/tools/wayland/ydotool/default.nix index 4a75eac8c574..15bc49987331 100644 --- a/nixpkgs/pkgs/tools/wayland/ydotool/default.nix +++ b/nixpkgs/pkgs/tools/wayland/ydotool/default.nix @@ -1,41 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, boost, libevdevplus, libuinputplus, iodash, cxxopts}: +{ lib, stdenv, fetchFromGitHub, cmake, scdoc, util-linux }: stdenv.mkDerivation rec { pname = "ydotool"; - version = "unstable-2021-01-20"; + version = "1.0.1"; src = fetchFromGitHub { owner = "ReimuNotMoe"; repo = "ydotool"; - rev = "b1d041f52f7bac364d6539b1251d29c3b77c0f37"; - sha256 = "1gzdbx6fv0dbcyia3yyzhv93az2gf90aszb9kcj5cnxywfpv9w9g"; + rev = "v${version}"; + sha256 = "sha256-maXXGCqB8dkGO8956hsKSwM4HQdYn6z1jBFENQ9sKcA="; }; - # upstream decided to use a cpp package manager called cpm. - # we need to disable that because it wants networking, furthermore, - # it does some system folder creating which also needs to be disabled. - # Both changes are to respect the sandbox. - patches = [ ./fixup-cmakelists.patch ]; + nativeBuildInputs = [ cmake scdoc ]; - - # cxxopts is a header only library. - # See pull request: https://github.com/ReimuNotMoe/ydotool/pull/105 - postPatch = '' - substituteInPlace CMakeLists.txt --replace \ - "PUBLIC cxxopts" \ - "PUBLIC" + postInstall = '' + substituteInPlace ${placeholder "out"}/lib/systemd/user/ydotool.service \ + --replace /usr/bin/kill "${util-linux}/bin/kill" ''; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ - boost libevdevplus libuinputplus iodash cxxopts - ]; - meta = with lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/ReimuNotMoe/ydotool"; description = "Generic Linux command-line automation tool"; - license = licenses.mit; - maintainers = with maintainers; [ willibutz ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ willibutz kraem ]; platforms = with platforms; linux; }; } diff --git a/nixpkgs/pkgs/tools/wayland/ydotool/fixup-cmakelists.patch b/nixpkgs/pkgs/tools/wayland/ydotool/fixup-cmakelists.patch deleted file mode 100644 index 965d5c38d83f..000000000000 --- a/nixpkgs/pkgs/tools/wayland/ydotool/fixup-cmakelists.patch +++ /dev/null @@ -1,58 +0,0 @@ -From bb8bc44d22060cd1215712117cf30eae09f4f6ba Mon Sep 17 00:00:00 2001 -From: Jappie Klooster <jappieklooster@hotmail.com> -Date: Fri, 2 Apr 2021 14:04:14 -0400 -Subject: [PATCH] Fixup cmaklists - -We remove cpm, which is a package manager for c++, -which requires networking, so it's better just deleted. - -Furthermore we delete the adddirectory statements. -These want to modify directories outside of the sandbox. ---- - CMakeLists.txt | 26 -------------------------- - 1 file changed, 26 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b5e8789..b797538 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,30 +13,6 @@ endif() - - include(${CPM_DOWNLOAD_LOCATION}) - --CPMAddPackage( -- NAME IODash -- GITHUB_REPOSITORY YukiWorkshop/IODash -- VERSION 0.1.0 --) -- --CPMAddPackage( -- NAME libevdevPlus -- GITHUB_REPOSITORY YukiWorkshop/libevdevPlus -- VERSION 0.2.1 --) -- --CPMAddPackage( -- NAME libuInputPlus -- GITHUB_REPOSITORY YukiWorkshop/libuInputPlus -- VERSION 0.2.1 --) -- --CPMAddPackage( -- NAME cxxopts -- GITHUB_REPOSITORY jarro2783/cxxopts -- VERSION 3.0.0 -- GIT_TAG 2d8e17c4f88efce80e274cb03eeb902e055a91d3 --) - - set(SOURCE_FILES_LIBRARY - CommonIncludes.hpp -@@ -74,5 +50,3 @@ add_executable(ydotool ${SOURCE_FILES_CLIENT}) - target_link_libraries(ydotool ydotool_library dl pthread uInputPlus evdevPlus) - install(TARGETS ydotool DESTINATION ${CMAKE_INSTALL_BINDIR}) - --add_subdirectory(Daemon) --add_subdirectory(manpage) --- -2.29.2 - |