From f2560115dc907a576aada7a4dfcdd8c117e9019b Mon Sep 17 00:00:00 2001
From: Fabian Thorand <f.thorand@gmail.com>
Date: Fri, 12 Mar 2021 00:01:38 +0100
Subject: [PATCH] dunst: fix 1.6.1 src and build

The previous bump to version 1.6.1 left the sha256 of the src attribute
unchanged, and as a consequence, it still built the old version.
But since the make config injected the version number, the binary still
self-reported as 1.6.1, even though it was built from 1.5.0.
---
 pkgs/applications/misc/dunst/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 65e86bb7dbe6..5dffbf56a36a 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -2,7 +2,7 @@
 , pkg-config, which, perl, libXrandr
 , cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver
 , gtk3, wayland, wayland-protocols
-, libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false
+, libXinerama, libnotify, pango, xorgproto, librsvg
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "dunst-project";
     repo = "dunst";
     rev = "v${version}";
-    sha256 = "0irwkqcgwkqaylcpvqgh25gn2ysbdm2kydipxfzcq1ddj9ns6f9c";
+    sha256 = "0lga1kj2vjbj9g9rl93nivngjmk5fkxdxwal8w96x9whwk9jvdga";
   };
 
   nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];
@@ -29,15 +29,12 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "PREFIX=$(out)"
     "VERSION=$(version)"
+    "SYSCONFDIR=$(out)/etc"
     "SERVICEDIR_DBUS=$(out)/share/dbus-1/services"
     "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
   ];
 
-  buildFlags = if dunstify then [ "dunstify" ] else [];
-
-  postInstall = lib.optionalString dunstify ''
-    install -Dm755 dunstify $out/bin
-  '' + ''
+  postInstall = ''
     wrapProgram $out/bin/dunst \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
   '';