diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-03-19 15:11:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 15:11:29 +0100 |
| commit | f4ffeaf9a5f4efd7d1fcf8d9f733f13f0978e278 (patch) | |
| tree | 7177d4ed02ec428ad7dddaab1cb44c315c65b0f2 | |
| parent | f4db78b4f2d9081049cdd0ebf62d5172b1345264 (diff) | |
| parent | f2d6e4ab04b194002c10dec1342bbde8b46ee840 (diff) | |
| download | nixlib-f4ffeaf9a5f4efd7d1fcf8d9f733f13f0978e278.tar nixlib-f4ffeaf9a5f4efd7d1fcf8d9f733f13f0978e278.tar.gz nixlib-f4ffeaf9a5f4efd7d1fcf8d9f733f13f0978e278.tar.bz2 nixlib-f4ffeaf9a5f4efd7d1fcf8d9f733f13f0978e278.tar.lz nixlib-f4ffeaf9a5f4efd7d1fcf8d9f733f13f0978e278.tar.xz nixlib-f4ffeaf9a5f4efd7d1fcf8d9f733f13f0978e278.tar.zst nixlib-f4ffeaf9a5f4efd7d1fcf8d9f733f13f0978e278.zip | |
Merge pull request #57889 from mat8913/flatpak-bubblewrap-paths
flatpak: Fix bubblewrap paths for icon-validator
| -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 000000000000..79257fd6be50 --- /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 1c4b6ea8c722..65c876320b5a 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 |