Merge master into closure-size

The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.

2 files changed, 1 insertions, 15 deletions

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index cd6f504465f46..4e7f74237812e 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "0wpinar2cxyzq2j7ff7lznc08f0n6qjdm9aavsarbgdpaf2s1xvq";
+    sha256 = "0xyy0qm3h22b69if2hmg36jzvvljxb1w0zy2m2a28kdqfzpa6m8g";
   };
 
   buildInputs = with gst_all_1; [
@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
-  patches = [ ./liferea-fix-notification-header-location.patch ];
-
   preFixup = ''
     for f in "$out"/bin/*; do
       wrapProgram "$f" \
diff --git a/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch b/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch
deleted file mode 100644
index 3cd322460b08f..0000000000000
--- a/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/src/notification/libnotify.c b/src/notification/libnotify.c
---- a/src/notification/libnotify.c	2016-01-28 19:33:19.000000000 +0100
-+++ b/src/notification/libnotify.c	2016-02-01 19:20:39.167580131 +0100
-@@ -40,7 +40,7 @@
- #include "ui/feed_list_view.h"
- #include "ui/ui_tray.h"
- 
--#include "notification/notification.h"
-+#include "../notification.h"
- 
- static gboolean supports_actions = FALSE;
- static gboolean supports_append  = FALSE;