diff options
author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2024-01-21 12:07:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-21 12:07:58 +0000 |
commit | 3af4a82a470699a20730ccd493c2c4008c94458a (patch) | |
tree | 30f0083340e2af56dc9fa8a2bf207ac74653348c /pkgs/applications/window-managers | |
parent | 58fcc2db9db8cb59a6c2aaa8acd6a265482aa292 (diff) | |
parent | 98088d718328340721e81705ed3c78fad978d09b (diff) | |
download | nixlib-3af4a82a470699a20730ccd493c2c4008c94458a.tar nixlib-3af4a82a470699a20730ccd493c2c4008c94458a.tar.gz nixlib-3af4a82a470699a20730ccd493c2c4008c94458a.tar.bz2 nixlib-3af4a82a470699a20730ccd493c2c4008c94458a.tar.lz nixlib-3af4a82a470699a20730ccd493c2c4008c94458a.tar.xz nixlib-3af4a82a470699a20730ccd493c2c4008c94458a.tar.zst nixlib-3af4a82a470699a20730ccd493c2c4008c94458a.zip |
Merge pull request #282453 from gepbird/picom-11
picom: 10.2 -> 11
Diffstat (limited to 'pkgs/applications/window-managers')
3 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index b5eda761ab33..27b54b23fa84 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -12,17 +12,17 @@ , libxcb , libxdg_basedir , libXext -, libXinerama , libxml2 , libxslt , makeWrapper , meson , ninja -, pcre +, pcre2 , pixman , pkg-config , stdenv , uthash +, xcbutil , xcbutilimage , xcbutilrenderutil , xorgproto @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "picom"; - version = "10.2"; + version = "11"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${finalAttrs.version}"; - hash = "sha256-C+icJXTkE+XMaU7N6JupsP8xhmRVggX9hY1P7za0pO0="; + hash = "sha256-KIblpEEW33ZxxTYuQ/lbUGEJcVdmSWdNOrVCvhOY/OU="; fetchSubmodules = true; }; @@ -63,11 +63,11 @@ stdenv.mkDerivation (finalAttrs: { libxcb libxdg_basedir libXext - libXinerama libxml2 libxslt - pcre + pcre2 pixman + xcbutil xcbutilimage xcbutilrenderutil xorgproto @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = licenses.mit; homepage = "https://github.com/yshui/picom"; - maintainers = with maintainers; [ ertes twey thiagokokada ]; + maintainers = with maintainers; [ ertes gepbird twey thiagokokada ]; platforms = platforms.linux; mainProgram = "picom"; }; diff --git a/pkgs/applications/window-managers/picom/picom-allusive.nix b/pkgs/applications/window-managers/picom/picom-allusive.nix index 0efb67f641bb..e0086142f1c3 100644 --- a/pkgs/applications/window-managers/picom/picom-allusive.nix +++ b/pkgs/applications/window-managers/picom/picom-allusive.nix @@ -1,4 +1,4 @@ -{ picom, lib, fetchFromGitHub, installShellFiles }: +{ picom, lib, fetchFromGitHub, installShellFiles, pcre }: picom.overrideAttrs (oldAttrs: rec { pname = "picom-allusive"; @@ -11,7 +11,7 @@ picom.overrideAttrs (oldAttrs: rec { hash = "sha256-yM4TJjoVs+i33m/u/oWlx1TDKJrgwlfiGu72DOL/tl8="; }; - nativeBuildInputs = [ installShellFiles ] ++ oldAttrs.nativeBuildInputs; + nativeBuildInputs = [ installShellFiles pcre ] ++ oldAttrs.nativeBuildInputs; postInstall = '' installManPage $src/man/picom.1.gz diff --git a/pkgs/applications/window-managers/picom/picom-jonaburg.nix b/pkgs/applications/window-managers/picom/picom-jonaburg.nix index 2c08a355dde8..d04cf5f4ecd6 100644 --- a/pkgs/applications/window-managers/picom/picom-jonaburg.nix +++ b/pkgs/applications/window-managers/picom/picom-jonaburg.nix @@ -1,4 +1,4 @@ -{ picom, lib, fetchFromGitHub }: +{ picom, lib, fetchFromGitHub, pcre }: picom.overrideAttrs (oldAttrs: rec { pname = "picom-jonaburg"; @@ -10,6 +10,8 @@ picom.overrideAttrs (oldAttrs: rec { sha256 = "sha256-4voCAYd0fzJHQjJo4x3RoWz5l3JJbRvgIXn1Kg6nz6Y="; }; + nativeBuildInputs = [ pcre ] ++ oldAttrs.nativeBuildInputs; + meta = with lib; { description = "A fork of picom featuring animations and improved rounded corners."; homepage = "https://github.com/jonaburg/picom"; |