diff options
author | Mateo Diaz <mateodd@icloud.com> | 2023-02-03 22:08:25 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-03 22:08:25 -0800 |
commit | 3bbb6e1413382997d5038ffed2d4f841530cee16 (patch) | |
tree | bcf3004da77422a1a79e1da7f948c3c3bb86468e /pkgs/tools/wayland | |
parent | 50c64a63d07b31ed570984162edef784b8a3cf86 (diff) | |
parent | 0a55d764ac14ac5e02fa386d5088f12e73f37e36 (diff) |
Merge branch 'NixOS:master' into swww
Diffstat (limited to 'pkgs/tools/wayland')
-rw-r--r-- | pkgs/tools/wayland/clipman/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/wayland/gtklock/default.nix | 56 | ||||
-rw-r--r-- | pkgs/tools/wayland/kanshi/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/wayland/shotman/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/wayland/slurp/default.nix | 31 | ||||
-rw-r--r-- | pkgs/tools/wayland/swayimg/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/wayland/swayr/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/wayland/swayrbar/default.nix | 30 | ||||
-rw-r--r-- | pkgs/tools/wayland/way-displays/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/wayland/wayland-proxy-virtwl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/wayland/waynergy/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/wayland/wev/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/wayland/wlprop/default.nix | 34 | ||||
-rw-r--r-- | pkgs/tools/wayland/wlr-randr/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/wayland/wob/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/wayland/wpaperd/default.nix | 36 | ||||
-rw-r--r-- | pkgs/tools/wayland/ydotool/default.nix | 4 |
17 files changed, 203 insertions, 39 deletions
diff --git a/pkgs/tools/wayland/clipman/default.nix b/pkgs/tools/wayland/clipman/default.nix index 3c974f4cb7798..d91699ba72958 100644 --- a/pkgs/tools/wayland/clipman/default.nix +++ b/pkgs/tools/wayland/clipman/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { homepage = "https://github.com/yory8/clipman"; description = "A simple clipboard manager for Wayland"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/gtklock/default.nix b/pkgs/tools/wayland/gtklock/default.nix new file mode 100644 index 0000000000000..642faf4100551 --- /dev/null +++ b/pkgs/tools/wayland/gtklock/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkgs +, pam +, scdoc +, gtk3 +, pkg-config +, gtk-layer-shell +, glib +, wayland +, wayland-scanner +}: + +stdenv.mkDerivation rec { + pname = "gtklock"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "jovanlanik"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-W+GyeGxlfp1YZtSFEZYXuHmvTVZ8mU1oBcsrWN1yvjU="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + scdoc + pkg-config + wayland-scanner + glib + ]; + + buildInputs = [ + wayland + gtk3 + pam + gtk-layer-shell + ]; + + installFlags = [ + "DESTDIR=$(out)" + "PREFIX=" + ]; + + meta = with lib; { + description = "GTK-based lockscreen for Wayland"; + longDescription = '' + Important note: for gtklock to work you need to set "security.pam.services.gtklock = {};" manually. + ''; # Following nixpkgs/pkgs/applications/window-managers/sway/lock.nix + homepage = "https://github.com/jovanlanik/gtklock"; + license = licenses.gpl3; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/tools/wayland/kanshi/default.nix b/pkgs/tools/wayland/kanshi/default.nix index f372ee5dae780..5e12e77374fe9 100644 --- a/pkgs/tools/wayland/kanshi/default.nix +++ b/pkgs/tools/wayland/kanshi/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "kanshi"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromSourcehut { owner = "~emersion"; repo = "kanshi"; rev = "v${version}"; - sha256 = "kqTRJhLd9vLGAPO5U5cWeZgzWzne+0Cr4TIS0ciZSGk="; + sha256 = "sha256-eGcgqj214fcfOrKqrAsxLG9LiNlAsWu0sgjxBB01u6Q="; }; strictDeps = true; diff --git a/pkgs/tools/wayland/shotman/default.nix b/pkgs/tools/wayland/shotman/default.nix index 91742a7c1c288..1b34619124920 100644 --- a/pkgs/tools/wayland/shotman/default.nix +++ b/pkgs/tools/wayland/shotman/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "shotman"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = pname; rev = "v${version}"; - hash = "sha256-QNRQInFZcB1nqzESTAqYWwqJ0oiJa6UMCpjY3aHBiyA="; + hash = "sha256-tyIvAe6wQxxHRkD46dYjHYtvv7OWDuurYi6tsdL8BtE="; }; - cargoHash = "sha256-BfH1HhBbgdCA1IqKNdl4/FEzZxHgJmoSKNVMJUrSHCA="; + cargoHash = "sha256-N42dGImQPqa/NXpqhEnMDsG1mrdNh1BM0BDvRS6Oiio="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/tools/wayland/slurp/default.nix b/pkgs/tools/wayland/slurp/default.nix index 87238a50f560e..50c02d83be234 100644 --- a/pkgs/tools/wayland/slurp/default.nix +++ b/pkgs/tools/wayland/slurp/default.nix @@ -1,29 +1,33 @@ { lib , stdenv , fetchFromGitHub +, cairo +, libxkbcommon , meson , ninja , pkg-config -, cairo -, libxkbcommon +, scdoc , wayland , wayland-protocols , wayland-scanner -, buildDocs ? true, scdoc +, buildDocs ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "slurp"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "emersion"; repo = "slurp"; - rev = "v${version}"; - sha256 = "sha256-5ZB34rqLyZmfjT/clxNRDmF0qgITFZ5xt/gIEXQzvQE="; + rev = "v${finalAttrs.version}"; + hash = "sha256-jUuY2wuN00libHDaJEmrvQAb1o989Ly3nLyKHV0jz8Q="; }; - strictDeps = true; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -38,13 +42,16 @@ stdenv.mkDerivation rec { wayland-protocols ]; - mesonFlags = lib.optional buildDocs "-Dman-pages=enabled"; + strictDeps = true; + + mesonFlags = [ (lib.mesonEnable "man-pages" buildDocs) ]; meta = with lib; { - description = "Select a region in a Wayland compositor"; homepage = "https://github.com/emersion/slurp"; + description = "Select a region in a Wayland compositor"; + changelog = "https://github.com/emersion/slurp/releases/tag/v${finalAttrs.version}"; license = licenses.mit; maintainers = with maintainers; [ buffet ]; - platforms = platforms.linux; + inherit (wayland.meta) platforms; }; -} +}) diff --git a/pkgs/tools/wayland/swayimg/default.nix b/pkgs/tools/wayland/swayimg/default.nix index 24f44fa8d3361..f3ba661e91f56 100644 --- a/pkgs/tools/wayland/swayimg/default.nix +++ b/pkgs/tools/wayland/swayimg/default.nix @@ -22,13 +22,13 @@ }: stdenv.mkDerivation rec { pname = "swayimg"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "artemsen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-864riSvWhWV4X84UeZ+xfQBOAQmwMrX6s90TXMGeruY="; + sha256 = "sha256-Iq7T00hvr9Mv50V/GKJBddjoeHdFa2DneVaXyxhMCE0="; }; strictDeps = true; diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix index c42a9cbf9c4f6..789ca9a3216ef 100644 --- a/pkgs/tools/wayland/swayr/default.nix +++ b/pkgs/tools/wayland/swayr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayr"; - version = "0.22.0"; + version = "0.24.0"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "swayr-${version}"; - sha256 = "sha256-HThKeuFe4slqakQE1QAfu3SMUL/Gq9DodnAKcU/gTEY="; + sha256 = "sha256-Cl/c8KfBfrBIL/AqhZK7DfEcMQNLvxOoWvAq9qqLQDQ="; }; - cargoSha256 = "sha256-c13u5EWRrTd9HbL6oLMd4xeQyAncrx5OjzW7FwPIBsE="; + cargoHash = "sha256-+z/Ru1c4U/v8EDtz5uUPy/qQu47p1BzdCIWhsHWViGY="; patches = [ ./icon-paths.patch diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/tools/wayland/swayrbar/default.nix new file mode 100644 index 0000000000000..808d5c3c31de4 --- /dev/null +++ b/pkgs/tools/wayland/swayrbar/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromSourcehut, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "swayrbar"; + version = "0.3.4"; + + src = fetchFromSourcehut { + owner = "~tsdh"; + repo = "swayr"; + rev = "swayrbar-${version}"; + sha256 = "sha256-OQhq5ZUe2OrfRFxoaAbbewoHgQVPv9cQy0VCpYe1SNo="; + }; + + cargoHash = "sha256-vM4SoRbVylN90b378Qk18A8/2S2IB88lnGCM6sqrhs8="; + + # don't build swayr + buildAndTestSubdir = pname; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { + description = "Status command for sway's swaybar implementing the swaybar-protocol"; + homepage = "https://git.sr.ht/~tsdh/swayr#a-idswayrbarswayrbara"; + license = with licenses; [ gpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ sebtm ]; + }; +} diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/tools/wayland/way-displays/default.nix index 126f2a4ec9fb4..60f2b3e837464 100644 --- a/pkgs/tools/wayland/way-displays/default.nix +++ b/pkgs/tools/wayland/way-displays/default.nix @@ -4,18 +4,18 @@ , pkg-config , wayland , libinput -, libyamlcpp +, yaml-cpp }: stdenv.mkDerivation rec { pname = "way-displays"; - version = "1.6.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "alex-courtis"; repo = "way-displays"; rev = "${version}"; - sha256 = "sha256-wrfRSJaVz0GjYxuIDvJ+16aaz+kRTtv0q5jN2IG4Uco="; + sha256 = "sha256-o8fju0EQy2KS5yxe9DP3A8ewYgA2GzJtMY41BGJUZis="; }; strictDeps = true; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland - libyamlcpp + yaml-cpp libinput ]; diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 3931fe9c3da04..7943457d38152 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -25,12 +25,12 @@ ocamlPackages.buildDunePackage rec { strictDeps = true; nativeBuildInputs = [ - ocamlPackages.ppx_cstruct pkg-config ]; buildInputs = [ libdrm ] ++ (with ocamlPackages; [ dune-configurator + ppx_cstruct wayland cmdliner logs diff --git a/pkgs/tools/wayland/waynergy/default.nix b/pkgs/tools/wayland/waynergy/default.nix index 7208334ea506b..fce7ac6605af9 100644 --- a/pkgs/tools/wayland/waynergy/default.nix +++ b/pkgs/tools/wayland/waynergy/default.nix @@ -15,18 +15,18 @@ }: stdenv.mkDerivation rec { pname = "waynergy"; - version = "0.0.13"; + version = "0.0.15"; src = fetchFromGitHub { owner = "r-c-f"; repo = "waynergy"; rev = "v${version}"; - hash = "sha256-eTY7tktUmoTZO3w9uP1P8cIz0mmFiWm5YFGVAS6JwwE="; + hash = "sha256-pk1U3svy9r7O9ivFjBNXsaOmgc+nv2QTuwwHejB7B4Q="; }; depsBuildBuild = [ pkg-config ]; - buildInputs = [ libdrm wayland wayland-protocols wl-clipboard libxkbcommon cmake libressl ]; nativeBuildInputs = [ meson ninja ]; + buildInputs = [ libdrm wayland wayland-protocols wl-clipboard libxkbcommon libressl ]; postPatch = '' substituteInPlace waynergy.desktop --replace "Exec=/usr/bin/waynergy" "Exec=$out/bin/waynergy" diff --git a/pkgs/tools/wayland/wev/default.nix b/pkgs/tools/wayland/wev/default.nix index 293a440fcc0fd..51b763d6dfe62 100644 --- a/pkgs/tools/wayland/wev/default.nix +++ b/pkgs/tools/wayland/wev/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://git.sr.ht/~sircmpwn/wev"; description = "Wayland event viewer"; longDescription = '' - This is a tool for debugging events on a Wayland window, analagous to the + This is a tool for debugging events on a Wayland window, analogous to the X11 tool xev. ''; license = licenses.mit; diff --git a/pkgs/tools/wayland/wlprop/default.nix b/pkgs/tools/wayland/wlprop/default.nix new file mode 100644 index 0000000000000..82f80a594ad0a --- /dev/null +++ b/pkgs/tools/wayland/wlprop/default.nix @@ -0,0 +1,34 @@ +{ fetchgit, gawk, jq, lib, makeWrapper, slurp, stdenv, sway }: + +stdenv.mkDerivation rec { + pname = "wlprop"; + version = "unstable-2022-08-18"; + + src = fetchgit { + url = "https://gist.github.com/f313386043395ff06570e02af2d9a8e0"; + rev = "758c548bfb4be5b437c428c8062b3987f126f002"; + sha256 = "sha256-ZJ9LYYrU2cNYikiVNTlEcI4QXcoqfl7iwk3Be+NhGG8="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + installPhase = '' + runHook preInstall + + install -Dm755 wlprop.sh $out/bin/wlprop + wrapProgram "$out/bin/wlprop" \ + --prefix PATH : "$out/bin:${lib.makeBinPath [ gawk jq slurp sway ]}" + + runHook postInstall + ''; + passthru.scriptName = "wlprop.sh"; + + meta = with lib; { + description = "An xprop clone for wlroots based compositors"; + homepage = "https://gist.github.com/crispyricepc/f313386043395ff06570e02af2d9a8e0"; + license = licenses.mit; + maintainers = with maintainers; [ sebtm ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/wayland/wlr-randr/default.nix b/pkgs/tools/wayland/wlr-randr/default.nix index 4551f3d5f4abc..637876e0a3ddb 100644 --- a/pkgs/tools/wayland/wlr-randr/default.nix +++ b/pkgs/tools/wayland/wlr-randr/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "wlr-randr"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ="; + sha256 = "sha256-iJSHCQbom+V0TrtEYrjMrMkdc6PoZrjhtcgebZYjQjI="; }; strictDeps = true; diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/tools/wayland/wob/default.nix index 75f23051c6eaa..bb03399f55fb8 100644 --- a/pkgs/tools/wayland/wob/default.nix +++ b/pkgs/tools/wayland/wob/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, inih , meson , ninja , pkg-config @@ -13,13 +14,13 @@ stdenv.mkDerivation rec { pname = "wob"; - version = "0.13"; + version = "0.14.2"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "sha256-CXRBNnnhNV5LBIasVtmGrRG4ZXFGC7qNInU7Y0QsHbs="; + sha256 = "sha256-u4jLVLGcMTgDEgN8jW5d59m3GorJX7Z6+qKhzvbON3k="; }; strictDeps = true; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ wayland wayland-protocols ] + buildInputs = [ inih wayland wayland-protocols ] ++ lib.optional stdenv.isLinux libseccomp; mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; diff --git a/pkgs/tools/wayland/wpaperd/default.nix b/pkgs/tools/wayland/wpaperd/default.nix new file mode 100644 index 0000000000000..433724bcf2162 --- /dev/null +++ b/pkgs/tools/wayland/wpaperd/default.nix @@ -0,0 +1,36 @@ +{ lib, rustPlatform, fetchFromGitHub, pkg-config, libxkbcommon }: + +rustPlatform.buildRustPackage rec { + pname = "wpaperd"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "danyspin97"; + repo = pname; + rev = version; + sha256 = "n1zlC2afog0UazsJEBAzXpnhVDeP3xqpNGXlJ65umHQ="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + libxkbcommon + ]; + + cargoSha256 = "8ZMdbJvedDqoDr2rhKM1TMB5N4aRde04x/9H212fe68="; + + meta = with lib; { + description = "Minimal wallpaper daemon for Wayland"; + longDescription = '' + It allows the user to choose a different image for each output (aka for each monitor) + just as swaybg. Moreover, a directory can be chosen and wpaperd will randomly choose + an image from it. Optionally, the user can set a duration, after which the image + displayed will be changed with another random one. + ''; + homepage = "https://github.com/danyspin97/wpaperd"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ DPDmancul ]; + }; +} diff --git a/pkgs/tools/wayland/ydotool/default.nix b/pkgs/tools/wayland/ydotool/default.nix index 8f142ef648816..319a9249f0a4f 100644 --- a/pkgs/tools/wayland/ydotool/default.nix +++ b/pkgs/tools/wayland/ydotool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ydotool"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "ReimuNotMoe"; repo = "ydotool"; rev = "v${version}"; - sha256 = "sha256-maXXGCqB8dkGO8956hsKSwM4HQdYn6z1jBFENQ9sKcA="; + sha256 = "sha256-RcPHQFXD3YgfF11OFpcnSowPlEjxy2c2RWhGYr30GhI="; }; strictDeps = true; |