From 46539f80fd65bd1007ed090129533959f312eb6f Mon Sep 17 00:00:00 2001 From: wentam Date: Sun, 25 Sep 2022 05:33:19 -0400 Subject: [PATCH 1/2] proycon-wayout: init at 0.1.3 --- pkgs/tools/wayland/proycon-wayout/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/tools/wayland/proycon-wayout/default.nix diff --git a/pkgs/tools/wayland/proycon-wayout/default.nix b/pkgs/tools/wayland/proycon-wayout/default.nix new file mode 100644 index 000000000000..2b4dc0f54e4f --- /dev/null +++ b/pkgs/tools/wayland/proycon-wayout/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, fetchFromSourcehut +, meson +, wayland-protocols +, wayland +, cairo +, pango +, scdoc +, ninja +, cmake +, pkg-config +, wayland-scanner +}: + +stdenv.mkDerivation rec { + pname = "proycon-wayout"; + version = "0.1.3"; + + src = fetchFromSourcehut { + owner = "~proycon"; + repo = "wayout"; + rev = version; + sha256 = "sha256-pxHz8y63xX9I425OG0jPvQVx4mAbTYHxVMMkfjZpURo="; + }; + + postPatch = '' + substituteInPlace meson.build --replace "'werror=true'," "" # Build fails with -Werror, remove + ''; + + postFixup = '' + mv $out/bin/wayout $out/bin/proycon-wayout # Avoid conflict with shinyzenith/wayout + ''; + + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ scdoc ninja meson cmake pkg-config wayland-scanner ]; + buildInputs = [ wayland-protocols wayland cairo pango ]; + + meta = with lib; { + description = "Takes text from standard input and outputs it to a desktop-widget on Wayland desktops."; + homepage = "https://git.sr.ht/~proycon/wayout"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ wentam ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eecc50b96c10..43b4e9981056 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1351,6 +1351,8 @@ with pkgs; pferd = callPackage ../tools/misc/pferd {}; + proycon-wayout = callPackage ../tools/wayland/proycon-wayout {}; + q = callPackage ../tools/networking/q {}; qFlipper = libsForQt515.callPackage ../tools/misc/qflipper { }; From b6910964819e1c068a956aa2b71b0cad886efd83 Mon Sep 17 00:00:00 2001 From: wentam Date: Sun, 25 Sep 2022 06:17:19 -0400 Subject: [PATCH 2/2] maintainers: add wentam --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5e51f2641677..7065e4eeb94b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14312,6 +14312,12 @@ fingerprint = "2145 955E 3F5E 0C95 3458 41B5 11F7 BAEA 8567 43FF"; }]; }; + wentam = { + name = "Matt Egeler"; + email = "wentam42@gmail.com"; + github = "wentam"; + githubId = 901583; + }; wentasah = { name = "Michal Sojka"; email = "wsh@2x.cz";