From 95f9a70b481464e3d64743ad5f4c481cc1a77e9e Mon Sep 17 00:00:00 2001 From: ElXreno Date: Thu, 7 Jul 2022 19:00:32 +0300 Subject: [PATCH 1/2] flatpak-builder: remove libdwarf dependency See https://github.com/flatpak/flatpak-builder/commit/ee8b921e9169e3f46a5e0e62b2bc583ecebdfe96 Co-authored-by: Jan Tojnar --- pkgs/development/tools/flatpak-builder/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 4e96294fe3e0..bc13fa471114 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -32,7 +32,6 @@ , gnutar , json-glib , libcap -, libdwarf , libsoup , libyaml , ostree @@ -106,7 +105,6 @@ in stdenv.mkDerivation rec { glib json-glib libcap - libdwarf libsoup libxml2 libyaml From 4eeaca86fdc4158db8fb5677d48149675a61929e Mon Sep 17 00:00:00 2001 From: ElXreno Date: Thu, 7 Jul 2022 20:05:25 +0300 Subject: [PATCH 2/2] nixosTests.installed-tests.flatpak-builder: fix tests This commit fixes the following error: Failed assertions: - Setting xdg.portal.enable to true requires a portal implementation in xdg.portal.extraPortals such as xdg-desktop-portal-gtk or xdg-desktop-portal-kde. --- nixos/tests/installed-tests/flatpak-builder.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/installed-tests/flatpak-builder.nix b/nixos/tests/installed-tests/flatpak-builder.nix index 31b9f2b258fd..41f4060fb69e 100644 --- a/nixos/tests/installed-tests/flatpak-builder.nix +++ b/nixos/tests/installed-tests/flatpak-builder.nix @@ -6,6 +6,7 @@ makeInstalledTest { testConfig = { services.flatpak.enable = true; xdg.portal.enable = true; + xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; environment.systemPackages = with pkgs; [ flatpak-builder ] ++ flatpak-builder.installedTestsDependencies; virtualisation.diskSize = 2048; };