summary refs log tree commit diff
path: root/pkgs/development/libraries/flatpak/bubblewrap-paths.patch
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-07-22 15:35:46 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-08-18 04:23:17 -0400
commit1728bc8d22ffe5e340dfb7cf3a8627f3638f5616 (patch)
tree8bf8c5e13969eb7439934d952ffdae89d065b0de /pkgs/development/libraries/flatpak/bubblewrap-paths.patch
parent37c22b49f5202a0993b7ef95f23217cacb892955 (diff)
downloadnixpkgs-1728bc8d22ffe5e340dfb7cf3a8627f3638f5616.tar
nixpkgs-1728bc8d22ffe5e340dfb7cf3a8627f3638f5616.tar.gz
nixpkgs-1728bc8d22ffe5e340dfb7cf3a8627f3638f5616.tar.bz2
nixpkgs-1728bc8d22ffe5e340dfb7cf3a8627f3638f5616.tar.lz
nixpkgs-1728bc8d22ffe5e340dfb7cf3a8627f3638f5616.tar.xz
nixpkgs-1728bc8d22ffe5e340dfb7cf3a8627f3638f5616.tar.zst
nixpkgs-1728bc8d22ffe5e340dfb7cf3a8627f3638f5616.zip
flatpak: 1.2.4 -> 1.4.2
* Regenerated all patches for 1.4.2 and resolved
  any conflicts.

* fix-test-paths.patch doesn't copy the whole locale archive
  because we have C.UTF8 now.

* nixos/flatpak creates a Flatpak system helper user
  Change introduced in 1.3.2.

Changes:
See https://github.com/flatpak/flatpak/releases/tag/1.3.1 through
1.4.2.
Diffstat (limited to 'pkgs/development/libraries/flatpak/bubblewrap-paths.patch')
-rw-r--r--pkgs/development/libraries/flatpak/bubblewrap-paths.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch
index 79257fd6be5..407811736f8 100644
--- a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch
+++ b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch
@@ -1,8 +1,8 @@
 diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c
-index 6e23d9f2..8c621ec4 100644
+index 9e885070..d02eeb8c 100644
 --- a/icon-validator/validate-icon.c
 +++ b/icon-validator/validate-icon.c
-@@ -149,8 +149,8 @@ rerun_in_sandbox (const char *arg_width,
+@@ -156,8 +156,8 @@ rerun_in_sandbox (const char *arg_width,
              "--unshare-ipc",
              "--unshare-net",
              "--unshare-pid",