From 495c3025979b8daf40f40439dd29f1cd21447a96 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Sat, 1 Jan 2022 12:57:53 +0100 Subject: [PATCH 1/4] pipectl: init at 0.2.2 --- pkgs/tools/misc/pipectl/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/misc/pipectl/default.nix diff --git a/pkgs/tools/misc/pipectl/default.nix b/pkgs/tools/misc/pipectl/default.nix new file mode 100644 index 000000000000..67754a92fe28 --- /dev/null +++ b/pkgs/tools/misc/pipectl/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "pipectl"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "Ferdi265"; + repo = pname; + rev = "v${version}"; + hash = "sha256-wa/SKKNXkl8XxE7XORodoAlrMc2QNGXGPE+/yya209Y="; + }; + + buildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://github.com/Ferdi265/pipectl"; + license = licenses.gpl3; + description = "a simple named pipe management utility"; + maintainers = with maintainers; [ synthetica ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ee2df5c990c..2eddaf2ce730 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8627,6 +8627,8 @@ with pkgs; pipe-rename = callPackage ../tools/misc/pipe-rename { }; + pipectl = callPackage ../tools/misc/pipectl { }; + pitivi = callPackage ../applications/video/pitivi { }; prism = callPackage ../applications/video/prism { }; From ef3f32f494ae8257c51614ffeffa9ede0a3e0a45 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Sat, 1 Jan 2022 12:59:49 +0100 Subject: [PATCH 2/4] wl-mirror: 0.5.0 -> 0.8.1 --- pkgs/tools/wayland/wl-mirror/default.nix | 33 ++++++++++++++++++------ 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index 0836723760e7..bf89d61adbeb 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -8,17 +8,31 @@ , wayland-scanner , wlr-protocols , libGL +, installExampleScripts ? true +, makeWrapper +, pipectl +, slurp +, rofi }: +let + wl-present-binpath = lib.makeBinPath [ + pipectl + rofi + slurp + (placeholder "out") + ]; +in + stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.5.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - sha256 = "1wjdjzj6h1q51yg70gdrq2yrgg6ihamcwhizxfrjq8955yy2y6ly"; + hash = "sha256-P5rvZPpIStlOSGj3PaiXAMPWqgWpkC+4IrixEMwoGJU="; }; patchPhase = '' @@ -27,14 +41,17 @@ stdenv.mkDerivation rec { --replace 'WLR_PROTOCOL_DIR "/usr' 'WLR_PROTOCOL_DIR "${wlr-protocols}' ''; - nativeBuildInputs = [ cmake pkg-config wayland-scanner ]; - buildInputs = [ - libGL - wayland - wayland-protocols - wlr-protocols + cmakeFlags = [ + "-DINSTALL_EXAMPLE_SCRIPTS=${if installExampleScripts then "ON" else "OFF"}" ]; + postInstall = lib.optionalString installExampleScripts '' + wrapProgram $out/bin/wl-present --prefix PATH ":" ${wl-present-binpath} + ''; + + nativeBuildInputs = [ cmake pkg-config wayland-scanner makeWrapper ]; + buildInputs = [ libGL wayland wayland-protocols wlr-protocols ]; + meta = with lib; { homepage = "https://github.com/Ferdi265/wl-mirror"; description = "Mirrors an output onto a Wayland surface."; From c18f0fd9cec0902500f0fe70faaa23720bf1411f Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Sat, 1 Jan 2022 13:04:31 +0100 Subject: [PATCH 3/4] pipectl: move cmake to nativeBuildInputs --- pkgs/tools/misc/pipectl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/pipectl/default.nix b/pkgs/tools/misc/pipectl/default.nix index 67754a92fe28..c5fb8c124f8a 100644 --- a/pkgs/tools/misc/pipectl/default.nix +++ b/pkgs/tools/misc/pipectl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hash = "sha256-wa/SKKNXkl8XxE7XORodoAlrMc2QNGXGPE+/yya209Y="; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { homepage = "https://github.com/Ferdi265/pipectl"; From 09a558e50fb849b74d432d1733849d8ad85169c6 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Sat, 1 Jan 2022 13:47:40 +0100 Subject: [PATCH 4/4] wl-mirror: add synthetica (myself) as maintainer --- pkgs/tools/wayland/wl-mirror/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index bf89d61adbeb..4476c5be93c7 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Ferdi265/wl-mirror"; description = "Mirrors an output onto a Wayland surface."; license = licenses.gpl3; - maintainers = with maintainers; [ twitchyliquid64 ]; + maintainers = with maintainers; [ synthetica twitchyliquid64 ]; platforms = platforms.linux; }; }