From ae3e0af87217e16d6f798adf48b0e7919c663548 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Tue, 20 Aug 2024 12:32:48 +0800
Subject: ptyxis: switch to finalAttrs pattern

---
 pkgs/by-name/pt/ptyxis/package.nix | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'pkgs/by-name/pt/ptyxis')

diff --git a/pkgs/by-name/pt/ptyxis/package.nix b/pkgs/by-name/pt/ptyxis/package.nix
index cee003e5f7d9f..1242c560c822e 100644
--- a/pkgs/by-name/pt/ptyxis/package.nix
+++ b/pkgs/by-name/pt/ptyxis/package.nix
@@ -14,27 +14,24 @@
   pcre2,
 }:
 
-let
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ptyxis";
   version = "46.5";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "chergert";
     repo = "ptyxis";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-PHjQJEM0W26ZpzW//+gsYCCq0lcikWh0707kDXxryAo=";
   };
 
   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 +44,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 +57,4 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [ aleksana ];
     platforms = lib.platforms.linux;
   };
-}
+})
-- 
cgit 1.4.1