commit 7b73ac5f5a08743fb72c0f474fe13c7acdc4e632 · pyrox.dev/nixpkgs

+23 -13

nixos/tests/installed-tests/xdg-desktop-portal.nix

···

       1
       1
       -
       { pkgs, makeInstalledTest, ... }:

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         makeInstalledTest,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       3
       8
        
       makeInstalledTest {

     

       4
       9
        
         tested = pkgs.xdg-desktop-portal;

     

       5
       10
        
       

     

       6
       6
       -
         # Red herring

     

       7
       7
       -
         # Failed to load RealtimeKit property: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.freedesktop.RealtimeKit1 was not provided by any .service files

     

       8
       8
       -
         # Maybe a red herring, enabling PipeWire doesn't fix the location test.

     

       9
       9
       -
         # Failed connect to PipeWire: Couldn't connect to PipeWire

     

       10
       11
        
         testConfig = {

     

       11
       12
        
           environment.variables = {

     

       12
       12
       -
             TEST_IN_CI = 1;

     

       13
       13
       -
             XDG_DATA_DIRS = "${pkgs.xdg-desktop-portal.installedTests}/share/installed-tests/xdg-desktop-portal/share";

     

       13
       13
       +
             GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" [

     

       14
       14
       +
               pkgs.glib.out

     

       15
       15
       +
               pkgs.umockdev.out

     

       16
       16
       +
             ];

     

       17
       17
       +
             # need to set this ourselves, because the tests will set LD_PRELOAD=libumockdev-preload.so,

     

       18
       18
       +
             # which can't be found because it's not in default rpath

     

       19
       19
       +
             LD_PRELOAD = "${pkgs.umockdev.out}/lib/libumockdev-preload.so";

     

       20
       20
       +
             XDP_TEST_IN_CI = 1;

     

       14
       21
        
           };

     

       15
       15
       -
           # Broken, see comment in the package file.

     

       16
       16
       -
           #services.geoclue2 = {

     

       17
       17
       -
           #  enable = true;

     

       18
       18
       -
           #  enableDemoAgent = true;

     

       19
       19
       -
           #};

     

       20
       20
       -
           #location.provider = "geoclue2";

     

       22
       22
       +
           environment.systemPackages = with pkgs; [

     

       23
       23
       +
             umockdev

     

       24
       24
       +
             wireless-regdb

     

       25
       25
       +
           ];

     

       26
       26
       +
           services.geoclue2 = {

     

       27
       27
       +
             enable = true;

     

       28
       28
       +
             enableDemoAgent = true;

     

       29
       29
       +
           };

     

       30
       30
       +
           location.provider = "geoclue2";

     

       21
       31
        
         };

     

       22
       32
        
       }

+53 -69

pkgs/development/libraries/xdg-desktop-portal/default.nix

···

       4
       4
        
         flatpak,

     

       5
       5
        
         fuse3,

     

       6
       6
        
         bubblewrap,

     

       7
       7
       -
         docbook_xml_dtd_412,

     

       8
       8
       -
         docbook_xml_dtd_43,

     

       9
       9
       -
         docbook_xsl,

     

       10
       7
        
         docutils,

     

       11
       8
        
         systemdMinimal,

     

       12
       9
        
         geoclue2,

     

       13
       10
        
         glib,

     

       14
       11
        
         gsettings-desktop-schemas,

     

       15
       12
        
         json-glib,

     

       16
       16
       -
         libportal,

     

       17
       17
       -
         libxml2,

     

       18
       13
        
         meson,

     

       19
       14
        
         ninja,

     

       20
       15
        
         nixosTests,

     
···

       26
       21
        
         pkg-config,

     

       27
       22
        
         stdenv,

     

       28
       23
        
         runCommand,

     

       29
       29
       -
         wrapGAppsHook3,

     

       30
       30
       -
         xmlto,

     

       24
       24
       +
         wrapGAppsNoGuiHook,

     

       31
       25
        
         bash,

     

       26
       26
       +
         dbus,

     

       27
       27
       +
         gst_all_1,

     

       28
       28
       +
         libgudev,

     

       29
       29
       +
         umockdev,

     

       30
       30
       +
         substituteAll,

     

       32
       31
        
         enableGeoLocation ? true,

     

       33
       32
        
         enableSystemd ? true,

     

       34
       33
        
       }:

     

       35
       34
        
       

     

       36
       35
        
       stdenv.mkDerivation (finalAttrs: {

     

       37
       36
        
         pname = "xdg-desktop-portal";

     

       38
       38
       -
         version = "1.18.4";

     

       37
       37
       +
         version = "1.20.0";

     

       39
       38
        
       

     

       40
       39
        
         outputs = [

     

       41
       40
        
           "out"

     
···

       45
       44
        
         src = fetchFromGitHub {

     

       46
       45
        
           owner = "flatpak";

     

       47
       46
        
           repo = "xdg-desktop-portal";

     

       48
       48
       -
           rev = finalAttrs.version;

     

       49
       49
       -
           hash = "sha256-o+aO7uGewDPrtgOgmp/CE2uiqiBLyo07pVCFrtlORFQ=";

     

       47
       47
       +
           tag = finalAttrs.version;

     

       48
       48
       +
           hash = "sha256-FHMa8fTr8qNEM5WptuMjMs/XOsvmFxi8pDaCrwJ3/ww=";

     

       50
       49
        
         };

     

       51
       50
        
       

     

       52
       51
        
         patches = [

     

       53
       52
        
           # The icon validator copied from Flatpak needs to access the gdk-pixbuf loaders

     

       54
       53
        
           # in the Nix store and cannot bind FHS paths since those are not available on NixOS.

     

       55
       55
       -
           (runCommand "icon-validator.patch" { } ''

     

       56
       56
       -
             # Flatpak uses a different path

     

       57
       57
       -
             substitute "${flatpak.icon-validator-patch}" "$out" \

     

       58
       58
       -
               --replace "/icon-validator/validate-icon.c" "/src/validate-icon.c"

     

       59
       59
       -
           '')

     

       54
       54
       +
           (substituteAll {

     

       55
       55
       +
             src = ./fix-icon-validation.patch;

     

       56
       56
       +
             inherit (builtins) storeDir;

     

       57
       57
       +
           })

     

       58
       58
       +
       

     

       59
       59
       +
           # Same for the sound validator, except the gdk-pixbuf part.

     

       60
       60
       +
           (substituteAll {

     

       61
       61
       +
             src = ./fix-sound-validation.patch;

     

       62
       62
       +
             inherit (builtins) storeDir;

     

       63
       63
       +
           })

     

       60
       64
        
       

     

       61
       65
        
           # Allow installing installed tests to a separate output.

     

       62
       66
        
           ./installed-tests-path.patch

     
···

       68
       72
        
       

     

       69
       73
        
           # test tries to read /proc/cmdline, which is not intended to be accessible in the sandbox

     

       70
       74
        
           ./trash-test.patch

     

       71
       71
       -
       

     

       72
       72
       -
           # Install files required to be in XDG_DATA_DIR of the installed tests

     

       73
       73
       -
           # Merged PR https://github.com/flatpak/xdg-desktop-portal/pull/1444

     

       74
       74
       -
           ./installed-tests-share.patch

     

       75
       75
        
         ];

     

       76
       76
        
       

     

       77
       77
        
         nativeBuildInputs = [

     

       78
       78
       -
           docbook_xml_dtd_412

     

       79
       79
       -
           docbook_xml_dtd_43

     

       80
       80
       -
           docbook_xsl

     

       81
       78
        
           docutils # for rst2man

     

       82
       82
       -
           libxml2

     

       83
       79
        
           meson

     

       84
       80
        
           ninja

     

       85
       81
        
           pkg-config

     

       86
       86
       -
           wrapGAppsHook3

     

       87
       87
       -
           xmlto

     

       82
       82
       +
           wrapGAppsNoGuiHook

     

       88
       83
        
         ];

     

       89
       84
        
       

     

       90
       85
        
         buildInputs =

     
···

       95
       90
        
             glib

     

       96
       91
        
             gsettings-desktop-schemas

     

       97
       92
        
             json-glib

     

       98
       98
       -
             libportal

     

       99
       93
        
             pipewire

     

       94
       94
       +
             gst_all_1.gst-plugins-base

     

       95
       95
       +
             libgudev

     

       96
       96
       +
             umockdev

     

       100
       97
        
       

     

       101
       98
        
             # For icon validator

     

       102
       99
        
             gdk-pixbuf

     

       103
       100
        
             librsvg

     

       104
       104
       -
       

     

       105
       105
       -
             # For document-fuse installed test.

     

       106
       106
       -
             (python3.withPackages (

     

       107
       107
       -
               pp: with pp; [

     

       108
       108
       -
                 pygobject3

     

       109
       109
       -
               ]

     

       110
       110
       -
             ))

     

       111
       101
        
             bash

     

       112
       102
        
           ]

     

       113
       103
        
           ++ lib.optionals enableGeoLocation [

     
···

       118
       108
        
           ];

     

       119
       109
        
       

     

       120
       110
        
         nativeCheckInputs = [

     

       111
       111
       +
           dbus

     

       112
       112
       +
           gdk-pixbuf

     

       113
       113
       +
           gst_all_1.gstreamer

     

       114
       114
       +
           gst_all_1.gst-plugins-good

     

       121
       115
        
           gobject-introspection

     

       122
       122
       -
           python3.pkgs.pytest

     

       123
       123
       -
           python3.pkgs.python-dbusmock

     

       124
       124
       -
           python3.pkgs.pygobject3

     

       125
       125
       -
           python3.pkgs.dbus-python

     

       116
       116
       +
       

     

       117
       117
       +
           # NB: this Python is used both for build-time tests

     

       118
       118
       +
           # and for installed (VM) tests, so it includes dependencies

     

       119
       119
       +
           # for both

     

       120
       120
       +
           (python3.withPackages (ps: [

     

       121
       121
       +
             ps.pytest

     

       122
       122
       +
             ps.python-dbusmock

     

       123
       123
       +
             ps.pygobject3

     

       124
       124
       +
             ps.dbus-python

     

       125
       125
       +
           ]))

     

       126
       126
       +
           umockdev

     

       126
       127
        
         ];

     

       127
       128
        
       

     

       128
       129
        
         mesonFlags =

     
···

       130
       131
        
             "--sysconfdir=/etc"

     

       131
       132
        
             "-Dinstalled-tests=true"

     

       132
       133
        
             "-Dinstalled_test_prefix=${placeholder "installedTests"}"

     

       134
       134
       +
             "-Ddocumentation=disabled" # pulls in a whole lot of extra stuff

     

       133
       135
        
             (lib.mesonEnable "systemd" enableSystemd)

     

       134
       136
        
           ]

     

       135
       137
        
           ++ lib.optionals (!enableGeoLocation) [

     

       136
       138
        
             "-Dgeoclue=disabled"

     

       137
       139
        
           ]

     

       138
       140
        
           ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [

     

       139
       139
       -
             "-Dpytest=disabled"

     

       141
       141
       +
             "-Dtests=disabled"

     

       140
       142
        
           ];

     

       141
       143
        
       

     

       142
       144
        
         strictDeps = true;

     
···

       148
       150
        
           substituteInPlace meson.build \

     

       149
       151
        
             --replace-fail "find_program('bwrap'"  "find_program('${lib.getExe bubblewrap}'"

     

       150
       152
        
       

     

       151
       151
       -
           # Disable test failing with libportal 0.9.0

     

       152
       152
       -
           ${

     

       153
       153
       -
             assert (lib.versionOlder finalAttrs.version "1.20.0");

     

       154
       154
       -
             "# TODO: Remove when updating to x-d-p 1.20.0"

     

       155
       155
       -
           }

     

       156
       156
       -
           substituteInPlace tests/test-portals.c \

     

       157
       157
       -
             --replace-fail 'g_test_add_func ("/portal/notification/bad-arg", test_notification_bad_arg);' ""

     

       153
       153
       +
           patchShebangs src/generate-method-info.py

     

       154
       154
       +
           patchShebangs tests/run-test.sh

     

       158
       155
        
         '';

     

       159
       156
        
       

     

       160
       157
        
         preCheck = ''

     
···

       165
       162
        
           # be flaky. Let's disable those downstream as hydra exhibits similar

     

       166
       163
        
           # flakes:

     

       167
       164
        
           #   https://github.com/NixOS/nixpkgs/pull/270085#issuecomment-1840053951

     

       168
       168
       -
           export TEST_IN_CI=1

     

       165
       165
       +
           export XDP_TEST_IN_CI=1

     

       166
       166
       +
       

     

       167
       167
       +
           # need to set this ourselves, because the tests will set LD_PRELOAD=libumockdev-preload.so,

     

       168
       168
       +
           # which can't be found because it's not in default rpath

     

       169
       169
       +
           export LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so

     

       169
       170
        
         '';

     

       170
       171
        
       

     

       171
       171
       -
         postFixup =

     

       172
       172
       -
           let

     

       173
       173
       -
             documentFuse = "${placeholder "installedTests"}/libexec/installed-tests/xdg-desktop-portal/test-document-fuse.py";

     

       174
       174
       -
             testPortals = "${placeholder "installedTests"}/libexec/installed-tests/xdg-desktop-portal/test-portals";

     

       175
       175
       -
       

     

       176
       176
       -
           in

     

       177
       177
       -
           ''

     

       178
       178
       -
             if [ -x '${documentFuse}' ] ; then

     

       179
       179
       -
               wrapGApp '${documentFuse}'

     

       180
       180
       -
               wrapGApp '${testPortals}'

     

       181
       181
       -
               # (xdg-desktop-portal:995): xdg-desktop-portal-WARNING **: 21:21:55.673: Failed to get GeoClue client: Timeout was reached

     

       182
       182
       -
               # xdg-desktop-portal:ERROR:../tests/location.c:22:location_cb: 'res' should be TRUE

     

       183
       183
       -
               # https://github.com/flatpak/xdg-desktop-portal/blob/1d6dfb57067dec182b546dfb60c87aa3452c77ed/tests/location.c#L21

     

       184
       184
       -
               rm $installedTests/share/installed-tests/xdg-desktop-portal/test-portals-location.test

     

       185
       185
       -
             fi

     

       186
       186
       -
           '';

     

       187
       187
       -
       

     

       188
       172
        
         passthru = {

     

       189
       173
        
           tests = {

     

       190
       174
        
             installedTests = nixosTests.installed-tests.xdg-desktop-portal;

     

       191
       175
        
       

     

       192
       176
        
             validate-icon = runCommand "test-icon-validation" { } ''

     

       193
       193
       -
               ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --sandbox 512 512 ${../../../applications/audio/zynaddsubfx/ZynLogo.svg} > "$out"

     

       177
       177
       +
               ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --ruleset=desktop --sandbox --path=${../../../applications/audio/zynaddsubfx/ZynLogo.svg} > "$out"

     

       194
       178
        
               grep format=svg "$out"

     

       195
       179
        
             '';

     

       196
       180
        
           };

     

       197
       181
        
         };

     

       198
       182
        
       

     

       199
       199
       -
         meta = with lib; {

     

       183
       183
       +
         meta = {

     

       200
       184
        
           description = "Desktop integration portals for sandboxed apps";

     

       201
       201
       -
           homepage = "https://flatpak.github.io/xdg-desktop-portal/";

     

       202
       202
       -
           license = licenses.lgpl2Plus;

     

       203
       203
       -
           maintainers = with maintainers; [ jtojnar ];

     

       204
       204
       -
           platforms = platforms.linux;

     

       185
       185
       +
           homepage = "https://flatpak.github.io/xdg-desktop-portal";

     

       186
       186
       +
           license = lib.licenses.lgpl2Plus;

     

       187
       187
       +
           maintainers = with lib.maintainers; [ jtojnar ];

     

       188
       188
       +
           platforms = lib.platforms.linux;

     

       205
       189
        
         };

     

       206
       190
        
       })

+33

pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch

···

       1
       1
       +
       diff --git a/src/validate-icon.c b/src/validate-icon.c

     

       2
       2
       +
       index c42265b..320f028 100644

     

       3
       3
       +
       --- a/src/validate-icon.c

     

       4
       4
       +
       +++ b/src/validate-icon.c

     

       5
       5
       +
       @@ -254,7 +254,7 @@ flatpak_get_bwrap (void)

     

       6
       6
       +
        static int

     

       7
       7
       +
        rerun_in_sandbox (int input_fd)

     

       8
       8
       +
        {

     

       9
       9
       +
       -  const char * const usrmerged_dirs[] = { "bin", "lib32", "lib64", "lib", "sbin" };

     

       10
       10
       +
       +  const char * const usrmerged_dirs[] = { };

     

       11
       11
       +
          g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free);

     

       12
       12
       +
          g_autofree char* arg_input_fd = NULL;

     

       13
       13
       +
          char validate_icon[PATH_MAX + 1];

     

       14
       14
       +
       @@ -276,8 +276,7 @@ rerun_in_sandbox (int input_fd)

     

       15
       15
       +
                    "--unshare-ipc",

     

       16
       16
       +
                    "--unshare-net",

     

       17
       17
       +
                    "--unshare-pid",

     

       18
       18
       +
       -            "--ro-bind", "/usr", "/usr",

     

       19
       19
       +
       -            "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",

     

       20
       20
       +
       +            "--ro-bind", "@storeDir@", "@storeDir@",

     

       21
       21
       +
                    "--ro-bind", validate_icon, validate_icon,

     

       22
       22
       +
                    NULL);

     

       23
       23
       +
        

     

       24
       24
       +
       @@ -320,6 +319,9 @@ rerun_in_sandbox (int input_fd)

     

       25
       25
       +
          if (g_getenv ("G_MESSAGES_PREFIXED"))

     

       26
       26
       +
            add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL);

     

       27
       27
       +
        

     

       28
       28
       +
       +  if (g_getenv ("GDK_PIXBUF_MODULE_FILE"))

     

       29
       29
       +
       +    add_args (args, "--setenv", "GDK_PIXBUF_MODULE_FILE", g_getenv ("GDK_PIXBUF_MODULE_FILE"), NULL);

     

       30
       30
       +
       +

     

       31
       31
       +
          arg_input_fd = g_strdup_printf ("%d", input_fd);

     

       32
       32
       +
          add_args (args,

     

       33
       33
       +
                    validate_icon,

+32

pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch

···

       1
       1
       +
       diff --git a/src/validate-sound.c b/src/validate-sound.c

     

       2
       2
       +
       index 7348d46..8b87c78 100644

     

       3
       3
       +
       --- a/src/validate-sound.c

     

       4
       4
       +
       +++ b/src/validate-sound.c

     

       5
       5
       +
       @@ -234,7 +234,7 @@ flatpak_get_bwrap (void)

     

       6
       6
       +
        static int

     

       7
       7
       +
        rerun_in_sandbox (int input_fd)

     

       8
       8
       +
        {

     

       9
       9
       +
       -  const char * const usrmerged_dirs[] = { "bin", "lib32", "lib64", "lib", "sbin" };

     

       10
       10
       +
       +  const char * const usrmerged_dirs[] = { };

     

       11
       11
       +
          int i;

     

       12
       12
       +
          g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free);

     

       13
       13
       +
          char validate_sound[PATH_MAX + 1];

     

       14
       14
       +
       @@ -255,8 +255,7 @@ rerun_in_sandbox (int input_fd)

     

       15
       15
       +
                    "--unshare-ipc",

     

       16
       16
       +
                    "--unshare-net",

     

       17
       17
       +
                    "--unshare-pid",

     

       18
       18
       +
       -            "--ro-bind", "/usr", "/usr",

     

       19
       19
       +
       -            "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",

     

       20
       20
       +
       +            "--ro-bind", "@storeDir@", "@storeDir@",

     

       21
       21
       +
                    "--ro-bind", validate_sound, validate_sound,

     

       22
       22
       +
                    NULL);

     

       23
       23
       +
        

     

       24
       24
       +
       @@ -299,6 +298,8 @@ rerun_in_sandbox (int input_fd)

     

       25
       25
       +
          if (g_getenv ("G_MESSAGES_PREFIXED"))

     

       26
       26
       +
            add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL);

     

       27
       27
       +
        

     

       28
       28
       +
       +  if (g_getenv ("GST_PLUGIN_SYSTEM_PATH_1_0"))

     

       29
       29
       +
       +    add_args (args, "--setenv", "GST_PLUGIN_SYSTEM_PATH_1_0", g_getenv ("GST_PLUGIN_SYSTEM_PATH_1_0"), NULL);

     

       30
       30
       +
        

     

       31
       31
       +
          arg_input_fd = g_strdup_printf ("%d", input_fd);

     

       32
       32
       +
          add_args (args, validate_sound, "--fd", arg_input_fd, NULL);

+10 -13

pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch

···

       1
       1
        
       diff --git a/meson.build b/meson.build

     

       2
       2
       -
       index b25f9ef..7975f85 100644

     

       2
       2
       +
       index 4238adb..d3f89fd 100644

     

       3
       3
        
       --- a/meson.build

     

       4
       4
        
       +++ b/meson.build

     

       5
       5
       -
       @@ -40,8 +40,8 @@ if dataroot_dir == ''

     

       5
       5
       +
       @@ -43,8 +43,8 @@ if dataroot_dir == ''

     

       6
       6
        
            dataroot_dir = datadir

     

       7
       7
        
        endif

     

       8
       8
        
        

     
···

       14
       14
        
        

     

       15
       15
        
        summary({

     

       16
       16
        
       diff --git a/meson_options.txt b/meson_options.txt

     

       17
       17
       -
       index fccada3..ca87600 100644

     

       17
       17
       +
       index ed8c311..0a2bf7e 100644

     

       18
       18
        
       --- a/meson_options.txt

     

       19
       19
        
       +++ b/meson_options.txt

     

       20
       20
       -
       @@ -38,6 +38,10 @@ option('installed-tests',

     

       21
       21
       -
                type: 'boolean',

     

       22
       22
       -
                value: false,

     

       23
       23
       -
                description: 'Enable installation of some test cases')

     

       20
       20
       +
       @@ -54,3 +54,7 @@ option('sandboxed-sound-validation',

     

       21
       21
       +
               type: 'feature',

     

       22
       22
       +
               value: 'enabled',

     

       23
       23
       +
               description: 'Use Bubblewrap to sandbox sound validation. Disabling this option may lead to security vulnerabilities.')

     

       24
       24
        
       +option('installed_test_prefix',

     

       25
       25
       -
       +        type: 'string',

     

       26
       26
       -
       +        value: '',

     

       27
       27
       -
       +        description: 'Prefix for installed tests')

     

       28
       28
       -
        option('pytest',

     

       29
       29
       -
                type: 'feature',

     

       30
       30
       -
                value: 'auto',

     

       25
       25
       +
       +       type: 'string',

     

       26
       26
       +
       +       value: '',

     

       27
       27
       +
       +       description: 'Prefix for installed tests')

-9

pkgs/development/libraries/xdg-desktop-portal/installed-tests-share.patch

···

       1
       1
       -
       diff --git a/tests/share/applications/meson.build b/tests/share/applications/meson.build

     

       2
       2
       -
       index d56b633..3ad3371 100644

     

       3
       3
       -
       --- a/tests/share/applications/meson.build

     

       4
       4
       -
       +++ b/tests/share/applications/meson.build

     

       5
       5
       -
       @@ -1,2 +1,2 @@

     

       6
       6
       -
       -configure_file(input: 'furrfix.desktop', output: '@PLAINNAME@', copy: true)

     

       7
       7
       -
       -configure_file(input: 'mimeinfo.cache', output: '@PLAINNAME@', copy: true)

     

       8
       8
       -
       +configure_file(input: 'furrfix.desktop', output: '@PLAINNAME@', copy: true, install: enable_installed_tests, install_dir: installed_tests_data_dir / 'share' / 'applications')

     

       9
       9
       -
       +configure_file(input: 'mimeinfo.cache', output: '@PLAINNAME@', copy: true, install: enable_installed_tests, install_dir: installed_tests_data_dir / 'share' / 'applications')

+5 -5

pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch

···

       1
       1
       -
       diff --git a/src/portal-impl.c b/src/portal-impl.c

     

       2
       2
       -
       index 85b3a23..6d43636 100644

     

       3
       3
       -
       --- a/src/portal-impl.c

     

       4
       4
       -
       +++ b/src/portal-impl.c

     

       5
       5
       -
       @@ -275,6 +275,8 @@ load_installed_portals (gboolean opt_verbose)

     

       1
       1
       +
       diff --git a/src/xdp-portal-impl.c b/src/xdp-portal-impl.c

     

       2
       2
       +
       index 770c265..a34ca8e 100644

     

       3
       3
       +
       --- a/src/xdp-portal-impl.c

     

       4
       4
       +
       +++ b/src/xdp-portal-impl.c

     

       5
       5
       +
       @@ -277,6 +277,8 @@ load_installed_portals (gboolean opt_verbose)

     

       6
       6
        
        

     

       7
       7
        
          /* We need to override this in the tests */

     

       8
       8
        
          portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR");

+8 -8

pkgs/development/libraries/xdg-desktop-portal/trash-test.patch

···

       1
       1
        
       diff --git a/tests/test_trash.py b/tests/test_trash.py

     

       2
       2
       -
       index d745cd2..173e3e5 100644

     

       2
       2
       +
       index 2637256..e89d45c 100644

     

       3
       3
        
       --- a/tests/test_trash.py

     

       4
       4
        
       +++ b/tests/test_trash.py

     

       5
       5
       -
       @@ -24,13 +24,6 @@ class TestTrash:

     

       6
       6
       -
            def test_version(self, portal_mock):

     

       7
       7
       -
                portal_mock.check_version(1)

     

       5
       5
       +
       @@ -13,13 +13,6 @@ class TestTrash:

     

       6
       6
       +
            def test_version(self, portals, dbus_con):

     

       7
       7
       +
                xdp.check_version(dbus_con, "Trash", 1)

     

       8
       8
        
        

     

       9
       9
       -
       -    def test_trash_file_fails(self, portal_mock):

     

       10
       10
       -
       -        trash_intf = portal_mock.get_dbus_interface()

     

       9
       9
       +
       -    def test_trash_file_fails(self, portals, dbus_con):

     

       10
       10
       +
       -        trash_intf = xdp.get_portal_iface(dbus_con, "Trash")

     

       11
       11
        
       -        with open("/proc/cmdline") as fd:

     

       12
       12
        
       -            result = trash_intf.TrashFile(fd.fileno())

     

       13
       13
        
       -

     

       14
       14
        
       -        assert result == 0

     

       15
       15
        
       -

     

       16
       16
       -
            def test_trash_file(self, portal_mock):

     

       17
       17
       -
                trash_intf = portal_mock.get_dbus_interface()

     

       16
       16
       +
            def test_trash_file(self, portals, dbus_con):

     

       17
       17
       +
                trash_intf = xdp.get_portal_iface(dbus_con, "Trash")

     

       18
       18