diff options
| author | Matthew Harm Bekkema <id@mbekkema.name> | 2019-03-19 15:57:43 +1100 |
|---|---|---|
| committer | Matthew Harm Bekkema <id@mbekkema.name> | 2019-03-19 15:57:43 +1100 |
| commit | f2d6e4ab04b194002c10dec1342bbde8b46ee840 (patch) | |
| tree | 6728679bff9665d1cfdea22e001034b245dcf271 /pkgs/development/libraries/flatpak | |
| parent | e6ccb67e23bce78e152ddcd9a85b6a44651e276f (diff) | |
| download | nixpkgs-f2d6e4ab04b194002c10dec1342bbde8b46ee840.tar nixpkgs-f2d6e4ab04b194002c10dec1342bbde8b46ee840.tar.gz nixpkgs-f2d6e4ab04b194002c10dec1342bbde8b46ee840.tar.bz2 nixpkgs-f2d6e4ab04b194002c10dec1342bbde8b46ee840.tar.lz nixpkgs-f2d6e4ab04b194002c10dec1342bbde8b46ee840.tar.xz nixpkgs-f2d6e4ab04b194002c10dec1342bbde8b46ee840.tar.zst nixpkgs-f2d6e4ab04b194002c10dec1342bbde8b46ee840.zip | |
flatpak: Fix bubblewrap paths for icon-validator
Otherwise, `flatpak-validate-icon --sandbox` gives error: bwrap: Can't find source path /etc/ld.so.cache: No such file or directory
Diffstat (limited to 'pkgs/development/libraries/flatpak')
| -rw-r--r-- | pkgs/development/libraries/flatpak/bubblewrap-paths.patch | 15 | ||||
| -rw-r--r-- | pkgs/development/libraries/flatpak/default.nix | 4 |
2 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch new file mode 100644 index 00000000000..79257fd6be5 --- /dev/null +++ b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch @@ -0,0 +1,15 @@ +diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c +index 6e23d9f2..8c621ec4 100644 +--- a/icon-validator/validate-icon.c ++++ b/icon-validator/validate-icon.c +@@ -149,8 +149,8 @@ rerun_in_sandbox (const char *arg_width, + "--unshare-ipc", + "--unshare-net", + "--unshare-pid", +- "--ro-bind", "/usr", "/usr", +- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", ++ "--ro-bind", "@storeDir@", "@storeDir@", ++ "--ro-bind", "/run/current-system", "/run/current-system", + "--ro-bind", validate_icon, validate_icon, + NULL); + diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 1c4b6ea8c72..65c876320b5 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; p11 = p11-kit; }) + (substituteAll { + src = ./bubblewrap-paths.patch; + inherit (builtins) storeDir; + }) # patch taken from gtk_doc ./respect-xml-catalog-files-var.patch ./use-flatpak-from-path.patch |