diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/wayland')
-rw-r--r-- | nixpkgs/pkgs/tools/wayland/mpvpaper/default.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/wayland/swayimg/default.nix | 79 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/wayland/swaysome/default.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/wayland/wob/default.nix | 7 |
4 files changed, 9 insertions, 89 deletions
diff --git a/nixpkgs/pkgs/tools/wayland/mpvpaper/default.nix b/nixpkgs/pkgs/tools/wayland/mpvpaper/default.nix index 51edcc0ea3a2..91ec1e80267f 100644 --- a/nixpkgs/pkgs/tools/wayland/mpvpaper/default.nix +++ b/nixpkgs/pkgs/tools/wayland/mpvpaper/default.nix @@ -2,7 +2,6 @@ , lib , meson , ninja -, wlroots , wayland , wayland-protocols , wayland-scanner @@ -17,13 +16,13 @@ stdenv.mkDerivation rec { pname = "mpvpaper"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "GhostNaN"; repo = pname; rev = version; - sha256 = "sha256-0LjIwOY2hBUb0nziD3HLP2Ek5+8v3ntssRFD9eQgWkc="; + sha256 = "sha256-pJPoI47KKazVT6RfqyftZe+lPe6Kn2cllRSfq0twUpQ="; }; strictDeps = true; @@ -37,7 +36,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - wlroots wayland wayland-protocols egl-wayland diff --git a/nixpkgs/pkgs/tools/wayland/swayimg/default.nix b/nixpkgs/pkgs/tools/wayland/swayimg/default.nix deleted file mode 100644 index 78a7ab67bad9..000000000000 --- a/nixpkgs/pkgs/tools/wayland/swayimg/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, meson -, ninja -, pkg-config -, wayland-scanner -, wayland -, wayland-protocols -, json_c -, libxkbcommon -, fontconfig -, giflib -, libheif -, libjpeg -, libwebp -, libtiff -, librsvg -, libpng -, libjxl -, libexif -, bash-completion -}: -stdenv.mkDerivation rec { - pname = "swayimg"; - version = "1.11"; - - src = fetchFromGitHub { - owner = "artemsen"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-UwIufR3EwbpNVHD1GypV3qNgiqDRllwtxAM0CZPodn0="; - }; - - patches = [ - (fetchpatch { - name = "link-libwebp-1.3.1.patch"; - url = "https://github.com/artemsen/swayimg/commit/bd3d6c838c699b876fd8c19b408c475eb47e17b6.patch"; - hash = "sha256-2aMq/GTqyKw+CQr8o8ij4P4yNjBXYKXShQUknStUb5c="; - }) - ]; - - strictDeps = true; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; - - buildInputs = [ - bash-completion - wayland - wayland-protocols - json_c - libxkbcommon - fontconfig - giflib - libheif - libjpeg - libwebp - libtiff - librsvg - libpng - libjxl - libexif - ]; - - meta = with lib; { - homepage = "https://github.com/artemsen/swayimg"; - description = "Image viewer for Sway/Wayland"; - changelog = "https://github.com/artemsen/swayimg/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ matthewcroughan ]; - platforms = platforms.linux; - mainProgram = "swayimg"; - }; -} diff --git a/nixpkgs/pkgs/tools/wayland/swaysome/default.nix b/nixpkgs/pkgs/tools/wayland/swaysome/default.nix index 4acf4115a048..308592e450f9 100644 --- a/nixpkgs/pkgs/tools/wayland/swaysome/default.nix +++ b/nixpkgs/pkgs/tools/wayland/swaysome/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "swaysome"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitLab { owner = "hyask"; repo = pname; rev = version; - sha256 = "sha256-KmGAp0EPnnM+hPRpUGsbt+NU2v5mcPaRUqo0pqUr1L8="; + sha256 = "sha256-U5W/9VL1t1/R4ADPxseBV6CMKx04I4vbp7sFmSqRZXk="; }; - cargoHash = "sha256-9sOR99CaTyMQoGMKP2Cag6YNxmgEqNPE/kiJPziqB9U="; + cargoHash = "sha256-QA3EQsYgjwx8QX50yaxiJyAPDlpYYqiqLiXco1kJmw0="; meta = with lib; { description = "Helper to make sway behave more like awesomewm"; diff --git a/nixpkgs/pkgs/tools/wayland/wob/default.nix b/nixpkgs/pkgs/tools/wayland/wob/default.nix index 67f7904192f9..f51ae7dc7657 100644 --- a/nixpkgs/pkgs/tools/wayland/wob/default.nix +++ b/nixpkgs/pkgs/tools/wayland/wob/default.nix @@ -5,6 +5,7 @@ , meson , ninja , pkg-config +, cmocka , scdoc , wayland-scanner , wayland @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "wob"; - version = "0.14.2"; + version = "0.15.1"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "sha256-u4jLVLGcMTgDEgN8jW5d59m3GorJX7Z6+qKhzvbON3k="; + sha256 = "sha256-9LFAEo17w861ldMJU+t1oLAKoM6gJc4Em4tSwQDXbKU="; }; strictDeps = true; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ inih wayland wayland-protocols ] + buildInputs = [ cmocka inih wayland wayland-protocols ] ++ lib.optional stdenv.isLinux libseccomp; mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; |