Merge https://github.com/NixOS/nixpkgs

1 files changed, 20 insertions, 26 deletions

diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
index 903de4d9a232..e44ffe1ec1d2 100644
--- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
@@ -1,9 +1,9 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, autoreconfHook
+, meson
+, ninja
 , pkg-config
-, libxml2
 , xdg-desktop-portal
 , gtk3
 , gnome
@@ -14,51 +14,45 @@
 , buildPortalsInGnome ? true
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-gtk";
-  version = "1.14.1";
+  version = "1.15.1";
 
   src = fetchFromGitHub {
     owner = "flatpak";
-    repo = pname;
-    rev = version;
-    sha256 = "8eyWeoiJ3b/GlqGVfmkf2/uS7FnOpRNgbfxwWjclw8w=";
+    repo = "xdg-desktop-portal-gtk";
+    rev = finalAttrs.version;
+    sha256 = "sha256-uXVjKsqoIjqJilJq8ERRzEqGKbkzc+Zl6y+37CAcYro=";
   };
 
   nativeBuildInputs = [
-    autoreconfHook
-    libxml2
+    meson
+    ninja
     pkg-config
     wrapGAppsHook
-    xdg-desktop-portal
   ];
 
   buildInputs = [
     glib
-    gsettings-desktop-schemas # settings exposed by settings portal
     gtk3
+    xdg-desktop-portal
+  ] ++ lib.optionals buildPortalsInGnome [
+    gsettings-desktop-schemas # settings exposed by settings portal
     gnome-desktop
-    gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s)
+    gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings)
   ];
 
-  configureFlags = if buildPortalsInGnome then [
-    "--enable-wallpaper"
-    "--enable-screenshot"
-    "--enable-screencast"
-    "--enable-background"
-    "--enable-settings"
-    "--enable-appchooser"
-  ] else [
-    # These are now enabled by default, even though we do not need them for GNOME.
-    # https://github.com/flatpak/xdg-desktop-portal-gtk/issues/355
-    "--disable-settings"
-    "--disable-appchooser"
+  mesonFlags = lib.optionals (!buildPortalsInGnome) [
+    "-Dwallpaper=disabled"
+    "-Dsettings=disabled"
+    "-Dappchooser=disabled"
+    "-Dlockdown=disabled"
   ];
 
   meta = with lib; {
     description = "Desktop integration portals for sandboxed apps";
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.linux;
-    license = licenses.lgpl2Plus;
+    license = licenses.lgpl21Plus;
   };
-}
+})