diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index e400051e2c66..32519594e4f0 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/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"; diff --git a/pkgs/development/tools/flatpak-builder/fix-paths.patch b/pkgs/development/tools/flatpak-builder/fix-paths.patch index cc7d9e82b0af..e24fade68669 100644 --- a/pkgs/development/tools/flatpak-builder/fix-paths.patch +++ b/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) {