colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #180554 from ElXreno/flatpak-builder-migrate

Browse Source 
flatpak-builder: remove libdwarf dependency and fix tests
This commit is contained in:
Jan Tojnar 2022-07-07 20:49:38 +02:00 committed by GitHub
commit b88fe63b17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/tests/installed-tests/flatpak-builder.nix
View File

@ -6,6 +6,7 @@ makeInstalledTest {
testConfig = { testConfig = {
services.flatpak.enable = true; services.flatpak.enable = true;
xdg.portal.enable = true; xdg.portal.enable = true;
xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
environment.systemPackages = with pkgs; [ flatpak-builder ] ++ flatpak-builder.installedTestsDependencies; environment.systemPackages = with pkgs; [ flatpak-builder ] ++ flatpak-builder.installedTestsDependencies;
virtualisation.diskSize = 2048; virtualisation.diskSize = 2048;
}; };

2
pkgs/development/tools/flatpak-builder/default.nix
View File

@ -32,7 +32,6 @@
, gnutar , gnutar
, json-glib , json-glib
, libcap , libcap
, libdwarf
, libsoup , libsoup
, libyaml , libyaml
, ostree , ostree
@ -106,7 +105,6 @@ in stdenv.mkDerivation rec {
glib glib
json-glib json-glib
libcap libcap
libdwarf
libsoup libsoup
libxml2 libxml2
libyaml libyaml