summary refs log tree commit diff
path: root/pkgs/tools/networking/network-manager
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2018-07-24 02:08:28 +0200
committerFlorian Klink <flokli@flokli.de>2018-08-04 01:08:25 +0200
commite63ef63c93c9f578fc06bf2ecd708b902e543bab (patch)
tree0a96e07d59642e11bd514b278227adec1a6eb309 /pkgs/tools/networking/network-manager
parent88b2b6c71c0bc590d9900730d1c137d7ff2ae7e2 (diff)
downloadnixlib-e63ef63c93c9f578fc06bf2ecd708b902e543bab.tar
nixlib-e63ef63c93c9f578fc06bf2ecd708b902e543bab.tar.gz
nixlib-e63ef63c93c9f578fc06bf2ecd708b902e543bab.tar.bz2
nixlib-e63ef63c93c9f578fc06bf2ecd708b902e543bab.tar.lz
nixlib-e63ef63c93c9f578fc06bf2ecd708b902e543bab.tar.xz
nixlib-e63ef63c93c9f578fc06bf2ecd708b902e543bab.tar.zst
nixlib-e63ef63c93c9f578fc06bf2ecd708b902e543bab.zip
network-manager-applet: add patch for import file chooser
Diffstat (limited to 'pkgs/tools/networking/network-manager')
-rw-r--r--pkgs/tools/networking/network-manager/applet.nix19
1 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix
index 98b9b0aef4d6..644bf00e8c28 100644
--- a/pkgs/tools/networking/network-manager/applet.nix
+++ b/pkgs/tools/networking/network-manager/applet.nix
@@ -20,6 +20,25 @@ in stdenv.mkDerivation rec {
       url = https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/12.patch;
       sha256 = "0q5qbjpbrfvhqsprnwjwz4c42nly59cgnbn41w2zlxvqf29gjvwk";
     })
+
+    # following 3 patches:
+    # https://gitlab.gnome.org/GNOME/network-manager-applet/issues/11
+    # should be fixed in 1.8.16
+    (fetchpatch {
+      name = "0001-connection-editor-hold-GApplication-while-the-import.patch";
+      url = https://gitlab.gnome.org/GNOME/network-manager-applet/commit/419c459e70ac752eb9226b0db1192fb0433d5d5e.patch;
+      sha256 = "0zi4fn2ynymi6ckkdrj8vcl78pwmkan4n8l53axaqb4kn0wnahdj";
+    })
+    (fetchpatch {
+      name = "0002-connection-list-attempt-a-VPN-import-first.patch";
+      url = https://gitlab.gnome.org/GNOME/network-manager-applet/commit/9d79ffdb148b31c7194c66946c87b6cd57ed54a3.patch;
+      sha256 = "1v0pdvkglrcfl1khp9j17cw0gvwg8scdha0wfziy054s1r6kyj23";
+    })
+    (fetchpatch {
+       name = "0003-bluetooth-fix-an-assert-failure-on-creation-cancella.patch";
+       url = https://gitlab.gnome.org/GNOME/network-manager-applet/commit/516f3f6c70ef9694d6004c64d50a9f3cd2725ab7.patch;
+       sha256 = "1msk4hmri3x5chmclxm7sdj1v9jg7pxqqrarlvsmfmshdwq4ljwk";
+    })
   ];
 
   mesonFlags = [