From d9028e84d29c46d24c973c7b0bb8dd0631e060ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D1=80=D0=B0=D1=81=D1=85=D0=BE=D0=B4=D0=BD=D1=8B=D0=B9=20?=
 =?UTF-8?q?=D0=BC=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=B0=D0=BB?=
 <78630225+aucub@users.noreply.github.com>
Date: Mon, 21 Oct 2024 06:53:37 +0800
Subject: [PATCH] =?UTF-8?q?libportal:=200.7.1=20=E2=86=92=200.8.1.=20Add?=
 =?UTF-8?q?=20libportal-qt6=20variant?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/flatpak/libportal/releases/tag/0.8.0
https://github.com/flatpak/libportal/releases/tag/0.8.1

Co-authored-by: dr56ekgbb <dr56ekgbb@mozmail.com>
---
 .../libraries/libportal/default.nix           | 99 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix
index b5c06c609f30..832146707d16 100644
--- a/pkgs/development/libraries/libportal/default.nix
+++ b/pkgs/development/libraries/libportal/default.nix
@@ -1,64 +1,79 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, meson
-, ninja
-, pkg-config
-, gobject-introspection
-, vala
-, gi-docgen
-, glib
-, gtk3
-, gtk4
-, libsForQt5
-, variant ? null
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  gobject-introspection,
+  vala,
+  gi-docgen,
+  glib,
+  gtk3,
+  gtk4,
+  libsForQt5,
+  qt6Packages,
+  variant ? null,
 }:
 
-assert variant == null || variant == "gtk3" || variant == "gtk4" || variant == "qt5";
+assert
+  variant == null || variant == "gtk3" || variant == "gtk4" || variant == "qt5" || variant == "qt6";
 
 stdenv.mkDerivation rec {
   pname = "libportal" + lib.optionalString (variant != null) "-${variant}";
-  version = "0.7.1";
+  version = "0.8.1";
 
-  outputs = [ "out" "dev" ]
-    ++ lib.optional (variant != "qt5") "devdoc";
+  outputs = [
+    "out"
+    "dev"
+  ] ++ lib.optional (variant != "qt5") "devdoc";
 
   src = fetchFromGitHub {
     owner = "flatpak";
     repo = "libportal";
     rev = version;
-    sha256 = "sha256-3roZJHnGFM7ClxbB7I/haexPTwYskidz9F+WV3RL9Ho=";
+    sha256 = "sha256-NAkD5pAQpmAtVxsFZt74PwURv+RbGBfqENIwyxEEUSc=";
   };
 
   depsBuildBuild = [
     pkg-config
   ];
 
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    gi-docgen
-  ] ++ lib.optionals (variant != "qt5") [
-    gobject-introspection
-    vala
-  ];
+  nativeBuildInputs =
+    [
+      meson
+      ninja
+      pkg-config
+      gi-docgen
+    ]
+    ++ lib.optionals (variant != "qt5") [
+      gobject-introspection
+      vala
+    ];
 
-  propagatedBuildInputs = [
-    glib
-  ] ++ lib.optionals (variant == "gtk3") [
-    gtk3
-  ] ++ lib.optionals (variant == "gtk4") [
-    gtk4
-  ] ++ lib.optionals (variant == "qt5") [
-    libsForQt5.qtbase
-    libsForQt5.qtx11extras
-  ];
+  propagatedBuildInputs =
+    [
+      glib
+    ]
+    ++ lib.optionals (variant == "gtk3") [
+      gtk3
+    ]
+    ++ lib.optionals (variant == "gtk4") [
+      gtk4
+    ]
+    ++ lib.optionals (variant == "qt5") [
+      libsForQt5.qtbase
+      libsForQt5.qtx11extras
+    ]
+    ++ lib.optionals (variant == "qt6") [
+      qt6Packages.qtbase
+    ];
 
   mesonFlags = [
     (lib.mesonEnable "backend-gtk3" (variant == "gtk3"))
     (lib.mesonEnable "backend-gtk4" (variant == "gtk4"))
     (lib.mesonEnable "backend-qt5" (variant == "qt5"))
+    (lib.mesonEnable "backend-qt6" (variant == "qt6"))
     (lib.mesonBool "vapi" (variant != "qt5"))
     (lib.mesonBool "introspection" (variant != "qt5"))
     (lib.mesonBool "docs" (variant != "qt5")) # requires introspection=true
@@ -72,11 +87,11 @@ stdenv.mkDerivation rec {
   # we don't have any binaries
   dontWrapQtApps = true;
 
-  meta = with lib; {
+  meta = {
     description = "Flatpak portal library";
     homepage = "https://github.com/flatpak/libportal";
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ jtojnar ];
-    platforms = platforms.unix;
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ jtojnar ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d6924f09cea..c9d53c637b93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9732,6 +9732,7 @@ with pkgs;
   libportal-gtk3 = libportal.override { variant = "gtk3"; };
   libportal-gtk4 = libportal.override { variant = "gtk4"; };
   libportal-qt5 = libportal.override { variant = "qt5"; };
+  libportal-qt6 = libportal.override { variant = "qt6"; };
 
   libmicrodns = callPackage ../development/libraries/libmicrodns { };