From 543c6ce4f8d0553f312dfa186de1e2f03e05bf28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 31 Jan 2024 03:38:06 +0000
Subject: [PATCH 1/3] clairvoyant: 3.1.2 -> 3.1.3

---
 pkgs/by-name/cl/clairvoyant/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/clairvoyant/package.nix b/pkgs/by-name/cl/clairvoyant/package.nix
index 397aefbea07f..782f60a9213d 100644
--- a/pkgs/by-name/cl/clairvoyant/package.nix
+++ b/pkgs/by-name/cl/clairvoyant/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "clairvoyant";
-  version = "3.1.2";
+  version = "3.1.3";
 
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = pname;
     rev = version;
-    hash = "sha256-q+yN3FAs1L+GzagOQRK5gw8ptBpHPqWOiCL6aaoWcJo=";
+    hash = "sha256-eAcd8JJmcsz8dm049g5xsF6gPpNQ6ZvGGIhKAoMlPTU=";
   };
 
   nativeBuildInputs = [

From e0905a878ffef427950d38d7ae25dc851004a4a1 Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Wed, 31 Jan 2024 08:52:47 +0200
Subject: [PATCH 2/3] clairvoyant: Add wrapGAppsHook4 and use finalAttrs
 pattern

---
 pkgs/by-name/cl/clairvoyant/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/cl/clairvoyant/package.nix b/pkgs/by-name/cl/clairvoyant/package.nix
index 782f60a9213d..14b5797db8f0 100644
--- a/pkgs/by-name/cl/clairvoyant/package.nix
+++ b/pkgs/by-name/cl/clairvoyant/package.nix
@@ -7,16 +7,17 @@
 , pkg-config
 , stdenv
 , vala
+, wrapGAppsHook4
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "clairvoyant";
   version = "3.1.3";
 
   src = fetchFromGitHub {
     owner = "cassidyjames";
-    repo = pname;
-    rev = version;
+    repo = "clairvoyant";
+    rev = finalAttrs.version;
     hash = "sha256-eAcd8JJmcsz8dm049g5xsF6gPpNQ6ZvGGIhKAoMlPTU=";
   };
 
@@ -25,6 +26,7 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     vala
+    wrapGAppsHook4
   ];
 
   buildInputs = [
@@ -33,11 +35,11 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/cassidyjames/clairvoyant/releases/tag/${finalAttrs.version}";
     description = "Ask questions and get psychic answers";
     homepage = "https://github.com/cassidyjames/clairvoyant";
-    changelog = "https://github.com/cassidyjames/clairvoyant/releases/tag/${version}";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ michaelgrahamevans ];
     mainProgram = "com.github.cassidyjames.clairvoyant";
+    maintainers = with maintainers; [ michaelgrahamevans ];
   };
-}
+})

From 4beb6898f89249b09c18cc473200a3b8ae07cbfa Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Wed, 31 Jan 2024 08:51:59 +0200
Subject: [PATCH 3/3] clairvoyant: Add hideUnsupportedVersionBanner option

Clairvoyant v3.1.3 introduced a non-dismissble banner stating that this
version of the app is unsupported, which is shown when the app detects
that it is not running as a Flatpak. This change adds the
"hideUnsupportedVersionBanner" option, disabled by default, which makes
it look like the app is running as a Flatpak.
---
 pkgs/by-name/cl/clairvoyant/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/cl/clairvoyant/package.nix b/pkgs/by-name/cl/clairvoyant/package.nix
index 14b5797db8f0..9889e1e43c3d 100644
--- a/pkgs/by-name/cl/clairvoyant/package.nix
+++ b/pkgs/by-name/cl/clairvoyant/package.nix
@@ -8,6 +8,8 @@
 , stdenv
 , vala
 , wrapGAppsHook4
+# Clairvoyant shows a non-dismissable banner recommending the use of the Flatpak version
+, hideUnsupportedVersionBanner ? false
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -34,6 +36,12 @@ stdenv.mkDerivation (finalAttrs: {
     libadwaita
   ];
 
+  preFixup = lib.optionalString hideUnsupportedVersionBanner ''
+    gappsWrapperArgs+=(
+      --set container true
+    )
+  '';
+
   meta = with lib; {
     changelog = "https://github.com/cassidyjames/clairvoyant/releases/tag/${finalAttrs.version}";
     description = "Ask questions and get psychic answers";