git.iko.soy/typeable/nixpkgs
on master help sign in
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.

commitf2560115dc907a576aada7a4dfcdd8c117e9019b authorFabian Thorand <f.thorand@gmail.com> dateFri 12 Mar 2021, 00:01 (6 years ago) parent793bc75
1 file changed+4−7
pkgs/applications/misc/dunst/default.nix+4−7
pkgs/applications/misc/dunst/default.nix+4−7
@@ -2,7 +2,7 @@
22, pkg-config, which, perl, libXrandr
33, cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver
44, gtk3, wayland, wayland-protocols
5−, libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false
5+, libXinerama, libnotify, pango, xorgproto, librsvg
66}:
77
88stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 owner = "dunst-project";
1414 repo = "dunst";
1515 rev = "v${version}";
16− sha256 = "0irwkqcgwkqaylcpvqgh25gn2ysbdm2kydipxfzcq1ddj9ns6f9c";
16+ sha256 = "0lga1kj2vjbj9g9rl93nivngjmk5fkxdxwal8w96x9whwk9jvdga";
1717 };
1818
1919 nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];
@@ -29,15 +29,12 @@ stdenv.mkDerivation rec {
2929 makeFlags = [
3030 "PREFIX=$(out)"
3131 "VERSION=$(version)"
32+ "SYSCONFDIR=$(out)/etc"
3233 "SERVICEDIR_DBUS=$(out)/share/dbus-1/services"
3334 "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
3435 ];
3536
36− buildFlags = if dunstify then [ "dunstify" ] else [];
37−
38− postInstall = lib.optionalString dunstify ''
39− install -Dm755 dunstify $out/bin
40− '' + ''
37+ postInstall = ''
4138 wrapProgram $out/bin/dunst \
4239 --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
4340 '';