@@ -1,7 +1,6 @@
11{ stdenv
22, lib
33, fetchFromGitHub
4−, fetchpatch
54, autoreconfHook
65, pkg-config
76, libxml2
@@ -16,28 +15,15 @@
1615
1716stdenv.mkDerivation rec {
1817 pname = "xdg-desktop-portal-gtk";
19− version = "1.10.0";
18+ version = "1.12.0";
2019
2120 src = fetchFromGitHub {
2221 owner = "flatpak";
2322 repo = pname;
2423 rev = version;
25− sha256 = "7w+evZLtmTmDHVVsw25bJz99xtlSCE8qTFSxez9tlZk=";
24+ sha256 = "I1ZoDqZQPfPwPr4Ybk+syz+YEkrK2ReflZaJJWD4Nsk=";
2625 };
2726
28− patches = [
29− # Fix broken translation.
30− # https://github.com/flatpak/xdg-desktop-portal-gtk/issues/353
31− (fetchpatch {
32− url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/e34f49ca8365801a7fcacccb46ab1e62aec17435.patch";
33− sha256 = "umMsSP0fuSQgxlHLaZlg25ln1aAL1mssWzPMIWAOUt4=";
34− })
35− (fetchpatch {
36− url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/19c5385b9f5fe0f8dac8ae7cc4493bb08f802de6.patch";
37− sha256 = "nbmOb5er20zBOO4K2geYITafqBaNHbDpq1OOvIVD6hY=";
38− })
39− ];
40−
4127 nativeBuildInputs = [
4228 autoreconfHook
4329 libxml2
@@ -54,13 +40,18 @@ stdenv.mkDerivation rec {
5440 gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s)
5541 ];
5642
57− configureFlags = lib.optionals buildPortalsInGnome [
43+ configureFlags = if buildPortalsInGnome then [
5844 "--enable-wallpaper"
5945 "--enable-screenshot"
6046 "--enable-screencast"
6147 "--enable-background"
6248 "--enable-settings"
6349 "--enable-appchooser"
50+ ] else [
51+ # These are now enabled by default, even though we do not need them for GNOME.
52+ # https://github.com/flatpak/xdg-desktop-portal-gtk/issues/355
53+ "--disable-settings"
54+ "--disable-appchooser"
6455 ];
6556
6657 meta = with lib; {