Unverified Commit f99442e5 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #336015 from Aleksanaa/ptyxis 

ptyxis: 46.5 -> 46.6
parents e0c9c49c f6888ebd

pkgs/by-name/pt/ptyxis/package.nix

+10 −16
Original line number Diff line number Diff line
@@ -14,27 +14,25 @@ 
  pcre2,

}:



let

  version = "46.5";

stdenv.mkDerivation (finalAttrs: {

  pname = "ptyxis";

  version = "46.6";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "chergert";

    repo = "ptyxis";

    rev = version;

    hash = "sha256-PHjQJEM0W26ZpzW//+gsYCCq0lcikWh0707kDXxryAo=";

    rev = finalAttrs.version;

    hash = "sha256-exsb5+5jxUKRHDaaBG3rJcJoqLGa6n/dsMlDtwUGfJo=";

  };



  # FIXME: drop patched vte-gtk4 in 47.x release

  vte-gtk4-patched = vte-gtk4.overrideAttrs (prev: {

    patches = (prev.patches or [ ]) ++ [

      "${src}/build-aux/0001-a11y-implement-GtkAccessibleText.patch"

      "${src}/build-aux/0001-add-notification-and-shell-precmd-preexec.patch"

      "${finalAttrs.src}/build-aux/0001-a11y-implement-GtkAccessibleText.patch"

      "${finalAttrs.src}/build-aux/0001-add-notification-and-shell-precmd-preexec.patch"

    ];

  });

in

stdenv.mkDerivation {

  pname = "ptyxis";

  inherit version src;



  nativeBuildInputs = [

    meson
@@ -47,15 +45,11 @@ stdenv.mkDerivation { 
  buildInputs = [

    libadwaita

    json-glib

    vte-gtk4-patched

    finalAttrs.vte-gtk4-patched

    libportal-gtk4

    pcre2

  ];



  passthru = {

    inherit vte-gtk4-patched;

  };



  meta = {

    description = "Terminal for GNOME with first-class support for containers";

    homepage = "https://gitlab.gnome.org/chergert/ptyxis";
@@ -64,4 +58,4 @@ stdenv.mkDerivation { 
    maintainers = with lib.maintainers; [ aleksana ];

    platforms = lib.platforms.linux;

  };

}
 
})