flatpak-builder: remove p7zip dependency

7zip is unmaintained and full of holes. In the worst case, it can be still picked up from PATH.

https://discourse.nixos.org/t/p7zip-and-possible-rces/6951

pkgs/development/tools/flatpak-builder/default.nix

@@ -29,7 +29,6 @@
 , gnumake
 , gnupg
 , gnutar
-, p7zip
 , json-glib
 , libcap
 , libdwarf
@@ -99,7 +98,6 @@ in stdenv.mkDerivation rec {
       cpio = "${cpio}/bin/cpio";
       git = "${gitMinimal}/bin/git";
       rofilesfuse = "${ostree}/bin/rofiles-fuse";
-      sevenz = "${p7zip}/bin/7z";
       strip = "${binutils}/bin/strip";
       eustrip = "${elfutils}/bin/eu-strip";
       euelfcompress = "${elfutils}/bin/eu-elfcompress";

pkgs/development/tools/flatpak-builder/fix-paths.patch

@@ -49,15 +49,6 @@
    va_end (ap);
  
    return res;
-@@ -470,7 +470,7 @@ un7z (GFile       *dir,
-       GError     **error)
- {
-   gboolean res;
--  const gchar *argv[] = { "7z",  "x", sevenz_path, NULL };
-+  const gchar *argv[] = { "@sevenz@",  "x", sevenz_path, NULL };
- 
-   res = flatpak_spawnv (dir, NULL, 0, error, argv);
- 
 @@ -483,7 +483,7 @@ unrpm (GFile   *dir,
         GError **error)
  {