Unverified Commit 3af4a82a authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

Merge pull request #282453 from gepbird/picom-11 

picom: 10.2 -> 11
parents 58fcc2db 98088d71

pkgs/applications/window-managers/picom/default.nix

+7 −7
Original line number Diff line number Diff line
@@ -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";

  };

pkgs/applications/window-managers/picom/picom-allusive.nix

+2 −2
Original line number Diff line number Diff line 
{ 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

pkgs/applications/window-managers/picom/picom-jonaburg.nix

+3 −1
Original line number Diff line number Diff line 
{ 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";