diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-13 18:01:03 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-13 18:01:03 +0000 |
commit | 4a7eb88e55f80623bb3ea4968ff4600814016ffb (patch) | |
tree | 8192722bb957a9c5a82250b2f03353959e861a23 /pkgs/tools/wayland | |
parent | 931baddf222daebf280b3e7cf3e8dd9542151405 (diff) | |
parent | 96896946ddc8d6d8ab0893667d2d609170617dbc (diff) | |
download | nixpkgs-4a7eb88e55f80623bb3ea4968ff4600814016ffb.tar nixpkgs-4a7eb88e55f80623bb3ea4968ff4600814016ffb.tar.gz nixpkgs-4a7eb88e55f80623bb3ea4968ff4600814016ffb.tar.bz2 nixpkgs-4a7eb88e55f80623bb3ea4968ff4600814016ffb.tar.lz nixpkgs-4a7eb88e55f80623bb3ea4968ff4600814016ffb.tar.xz nixpkgs-4a7eb88e55f80623bb3ea4968ff4600814016ffb.tar.zst nixpkgs-4a7eb88e55f80623bb3ea4968ff4600814016ffb.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/wayland')
-rw-r--r-- | pkgs/tools/wayland/sov/default.nix | 57 |
1 files changed, 37 insertions, 20 deletions
diff --git a/pkgs/tools/wayland/sov/default.nix b/pkgs/tools/wayland/sov/default.nix index 38578544feb..31451d82d4b 100644 --- a/pkgs/tools/wayland/sov/default.nix +++ b/pkgs/tools/wayland/sov/default.nix @@ -1,32 +1,49 @@ -{ lib, stdenv, fetchFromGitHub -, meson, pkg-config, wayland-scanner, ninja -, wayland, wayland-protocols, freetype, +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wayland-scanner +, freetype +, libglvnd +, libxkbcommon +, wayland +, wayland-protocols }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sov"; - version = "0.73"; + version = "0.92b"; src = fetchFromGitHub { owner = "milgra"; - repo = pname; - rev = version; - sha256 = "sha256-cjbTSvW1fCPl2wZ848XrUPU0bDQ4oXy+D8GqyBMaTwQ="; + repo = "sov"; + rev = finalAttrs.version; + hash = "sha256-1L5D0pzcXbkz3VS7VB6ID8BJEbGeNxjo3xCr71CGcIo="; }; - postPatch = '' - substituteInPlace src/sov/main.c --replace '/usr' $out - ''; - strictDeps = true; - nativeBuildInputs = [ meson pkg-config wayland-scanner ninja ]; - buildInputs = [ wayland wayland-protocols freetype ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + wayland-scanner + ]; + buildInputs = [ + freetype + libglvnd + libxkbcommon + wayland + wayland-protocols + ]; - meta = with lib; { - description = "An overlay that shows schemas for all workspaces to make navigation in sway easier."; + meta = { + description = "Workspace overview app for sway"; homepage = "https://github.com/milgra/sov"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + mainProgram = "sov"; + maintainers = with lib.maintainers; [ eclairevoyant ]; + platforms = lib.platforms.linux; }; -} +}) |