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

flatpak-builder: remove p7zip dependency

Browse Source 
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
This commit is contained in:
Jan Tojnar 2020-04-30 23:14:00 +02:00
parent eaf7c34d74
commit d74e044888
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

9
pkgs/development/tools/flatpak-builder/fix-paths.patch
View File

@ -49,15 +49,6 @@
va_end (ap); va_end (ap);
return res; 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, @@ -483,7 +483,7 @@ unrpm (GFile *dir,
GError **error) GError **error)
{ {