mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 12:23:02 +00:00
xdg-desktop-portal-gtk: 1.14.1 → 1.15.1
https://github.com/flatpak/xdg-desktop-portal-gtk/releases/tag/1.15.0 https://github.com/flatpak/xdg-desktop-portal-gtk/releases/tag/1.15.1 https://github.com/flatpak/xdg-desktop-portal-gtk/compare/1.14.1...1.15.1 - Dropped most GNOME-specific portals. - Switched to Meson as build system. - With Autotools, all portals except for `settings` and `appchooser` were disabled by default. Now, all four optional portals are `auto`-enabled so we need to disable them match the previous behaviour. Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
parent
c688132081
commit
6d646062c8
@ -1,9 +1,9 @@
|
|||||||
{ stdenv
|
{ stdenv
|
||||||
, lib
|
, lib
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, autoreconfHook
|
, meson
|
||||||
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, libxml2
|
|
||||||
, xdg-desktop-portal
|
, xdg-desktop-portal
|
||||||
, gtk3
|
, gtk3
|
||||||
, gnome
|
, gnome
|
||||||
@ -14,51 +14,45 @@
|
|||||||
, buildPortalsInGnome ? true
|
, buildPortalsInGnome ? true
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "xdg-desktop-portal-gtk";
|
pname = "xdg-desktop-portal-gtk";
|
||||||
version = "1.14.1";
|
version = "1.15.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "flatpak";
|
owner = "flatpak";
|
||||||
repo = pname;
|
repo = "xdg-desktop-portal-gtk";
|
||||||
rev = version;
|
rev = finalAttrs.version;
|
||||||
sha256 = "8eyWeoiJ3b/GlqGVfmkf2/uS7FnOpRNgbfxwWjclw8w=";
|
sha256 = "sha256-uXVjKsqoIjqJilJq8ERRzEqGKbkzc+Zl6y+37CAcYro=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook
|
meson
|
||||||
libxml2
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
xdg-desktop-portal
|
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glib
|
glib
|
||||||
gsettings-desktop-schemas # settings exposed by settings portal
|
|
||||||
gtk3
|
gtk3
|
||||||
|
xdg-desktop-portal
|
||||||
|
] ++ lib.optionals buildPortalsInGnome [
|
||||||
|
gsettings-desktop-schemas # settings exposed by settings portal
|
||||||
gnome-desktop
|
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 [
|
mesonFlags = lib.optionals (!buildPortalsInGnome) [
|
||||||
"--enable-wallpaper"
|
"-Dwallpaper=disabled"
|
||||||
"--enable-screenshot"
|
"-Dsettings=disabled"
|
||||||
"--enable-screencast"
|
"-Dappchooser=disabled"
|
||||||
"--enable-background"
|
"-Dlockdown=disabled"
|
||||||
"--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"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Desktop integration portals for sandboxed apps";
|
description = "Desktop integration portals for sandboxed apps";
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ jtojnar ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
license = licenses.lgpl2Plus;
|
license = licenses.lgpl21Plus;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user