JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dunst: fix 1.6.1 src and build

Browse Source 
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.
This commit is contained in:
Fabian Thorand 2021-03-12 00:01:38 +01:00
parent 793bc75c81
commit f2560115dc
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/misc/dunst/default.nix
View File

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