diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/window-managers/sway')
4 files changed, 37 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/applications/window-managers/sway/bg.nix b/nixpkgs/pkgs/applications/window-managers/sway/bg.nix index fe63f661c29b..aa5d12cdfc4f 100644 --- a/nixpkgs/pkgs/applications/window-managers/sway/bg.nix +++ b/nixpkgs/pkgs/applications/window-managers/sway/bg.nix @@ -26,14 +26,15 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Wallpaper tool for Wayland compositors"; + inherit (src.meta) homepage; longDescription = '' A wallpaper utility for Wayland compositors, that is compatible with any Wayland compositor which implements the following Wayland protocols: wlr-layer-shell, xdg-output, and xdg-shell. ''; - inherit (src.meta) homepage; license = licenses.mit; - platforms = platforms.linux; + mainProgram = "swaybg"; maintainers = with maintainers; [ primeos ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/sway/contrib.nix b/nixpkgs/pkgs/applications/window-managers/sway/contrib.nix index 40ac908fe580..2f7e20ede229 100644 --- a/nixpkgs/pkgs/applications/window-managers/sway/contrib.nix +++ b/nixpkgs/pkgs/applications/window-managers/sway/contrib.nix @@ -1,5 +1,5 @@ { lib, stdenv - +, fetchFromGitHub , coreutils , makeWrapper , sway-unwrapped @@ -14,13 +14,27 @@ , python3Packages }: +let + version = "unstable-2023-06-30"; + src = fetchFromGitHub { + owner = "OctopusET"; + repo = "sway-contrib"; + rev = "7e138bfc112872b79ac9fd766bc57c0f125b96d4"; + hash = "sha256-u4sw1NeAhl4FJCG2YOeY45SHoN7tw6cSJwEL5iqr0uQ="; + }; + + meta = with lib; { + homepage = "https://github.com/OctopusET/sway-contrib"; + license = licenses.mit; + platforms = platforms.all; + }; +in { grimshot = stdenv.mkDerivation rec { - pname = "grimshot"; - version = sway-unwrapped.version; + inherit version src; - src = sway-unwrapped.src; + pname = "grimshot"; dontBuild = true; dontConfigure = true; @@ -31,9 +45,9 @@ grimshot = stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = [ bash ]; installPhase = '' - installManPage contrib/grimshot.1 + installManPage grimshot.1 - install -Dm 0755 contrib/grimshot $out/bin/grimshot + install -Dm 0755 grimshot $out/bin/grimshot wrapProgram $out/bin/grimshot --set PATH \ "${lib.makeBinPath [ sway-unwrapped @@ -58,21 +72,17 @@ grimshot = stdenv.mkDerivation rec { meta = with lib; { description = "A helper for screenshots within sway"; - homepage = "https://github.com/swaywm/sway/tree/master/contrib"; - license = licenses.mit; - platforms = platforms.all; - maintainers = sway-unwrapped.meta.maintainers ++ (with maintainers; [ evils ]); + maintainers = with maintainers; [ evils ]; }; }; inactive-windows-transparency = python3Packages.buildPythonApplication rec { + inherit version src; + # long name is long lname = "inactive-windows-transparency"; pname = "sway-${lname}"; - version = sway-unwrapped.version; - - src = sway-unwrapped.src; format = "other"; dontBuild = true; @@ -81,12 +91,15 @@ inactive-windows-transparency = python3Packages.buildPythonApplication rec { propagatedBuildInputs = [ python3Packages.i3ipc ]; installPhase = '' - install -Dm 0755 $src/contrib/${lname}.py $out/bin/${lname}.py + install -Dm 0755 $src/${lname}.py $out/bin/${lname}.py ''; - meta = sway-unwrapped.meta // { + meta = with lib; { description = "It makes inactive sway windows transparent"; - homepage = "https://github.com/swaywm/sway/tree/${sway-unwrapped.version}/contrib"; + mainProgram = "${lname}.py"; + maintainers = with maintainers; [ + evils # packaged this as a side-effect of grimshot but doesn't use it + ]; }; }; diff --git a/nixpkgs/pkgs/applications/window-managers/sway/idle.nix b/nixpkgs/pkgs/applications/window-managers/sway/idle.nix index b410919022f1..0ee08dc7ca1d 100644 --- a/nixpkgs/pkgs/applications/window-managers/sway/idle.nix +++ b/nixpkgs/pkgs/applications/window-managers/sway/idle.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "swaywm"; repo = "swayidle"; rev = version; - sha256 = "sha256-/U6Y9H5ZqIJph3TZVcwr9+Qfd6NZNYComXuC1D9uGHg="; + hash = "sha256-/U6Y9H5ZqIJph3TZVcwr9+Qfd6NZNYComXuC1D9uGHg="; }; strictDeps = true; @@ -29,13 +29,14 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Idle management daemon for Wayland"; + inherit (src.meta) homepage; longDescription = '' Sway's idle management daemon. It is compatible with any Wayland compositor which implements the KDE idle protocol. ''; - inherit (src.meta) homepage; license = licenses.mit; - platforms = platforms.linux; + mainProgram = "swayidle"; maintainers = with maintainers; [ primeos ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/sway/lock.nix b/nixpkgs/pkgs/applications/window-managers/sway/lock.nix index 20a7a5ed7fe0..0b438df13d28 100644 --- a/nixpkgs/pkgs/applications/window-managers/sway/lock.nix +++ b/nixpkgs/pkgs/applications/window-managers/sway/lock.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { you need to set "security.pam.services.swaylock = {};" manually. ''; inherit (src.meta) homepage; + mainProgram = "swaylock"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; |