diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix index c5dc4b04eac7..a11af25ca81f 100644 --- a/pkgs/by-name/du/dunst/package.nix +++ b/pkgs/by-name/du/dunst/package.nix @@ -1,41 +1,43 @@ -{ stdenv -, lib -, fetchFromGitHub -, makeWrapper -, pkg-config -, which -, perl -, jq -, libXrandr -, coreutils -, cairo -, dbus -, systemd -, gdk-pixbuf -, glib -, libX11 -, libXScrnSaver -, wayland -, wayland-protocols -, libXinerama -, libnotify -, pango -, xorgproto -, librsvg -, testers -, withX11 ? true -, withWayland ? true +{ + stdenv, + lib, + fetchFromGitHub, + makeWrapper, + pkg-config, + which, + perl, + jq, + libXrandr, + coreutils, + cairo, + dbus, + systemd, + gdk-pixbuf, + glib, + libX11, + libXScrnSaver, + wayland, + wayland-protocols, + libXinerama, + libnotify, + pango, + xorgproto, + librsvg, + testers, + nix-update-script, + withX11 ? true, + withWayland ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "dunst"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; - rev = "v${finalAttrs.version}"; - hash = "sha256-eiFvvavXGNcHZnEGwlTLxRqFNdkvEZMwNIkVyDn1V6o="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-rnR/AErsjsaOMM/aF8VXZHV8b8OiUMRCi8IFLT4/8Vo="; }; nativeBuildInputs = [ @@ -46,26 +48,32 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ]; - buildInputs = [ - cairo - dbus - gdk-pixbuf - glib - libnotify - pango - librsvg - ] ++ lib.optionals withX11 [ - libX11 - libXScrnSaver - libXinerama - xorgproto - libXrandr - ] ++ lib.optionals withWayland [ - wayland - wayland-protocols - ]; + buildInputs = + [ + cairo + dbus + gdk-pixbuf + glib + libnotify + pango + librsvg + ] + ++ lib.optionals withX11 [ + libX11 + libXScrnSaver + libXinerama + xorgproto + libXrandr + ] + ++ lib.optionals withWayland [ + wayland + wayland-protocols + ]; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; makeFlags = [ "PREFIX=$(out)" @@ -73,30 +81,44 @@ stdenv.mkDerivation (finalAttrs: { "SYSCONFDIR=$(out)/etc" "SERVICEDIR_DBUS=$(out)/share/dbus-1/services" "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user" - ] - ++ lib.optional (!withX11) "X11=0" - ++ lib.optional (!withWayland) "WAYLAND=0"; + ] ++ lib.optional (!withX11) "X11=0" ++ lib.optional (!withWayland) "WAYLAND=0"; postInstall = '' wrapProgram $out/bin/dunst \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" wrapProgram $out/bin/dunstctl \ - --prefix PATH : "${lib.makeBinPath [ coreutils dbus ]}" + --prefix PATH : "${ + lib.makeBinPath [ + coreutils + dbus + ] + }" - substituteInPlace $out/share/zsh/site-functions/_dunstctl $out/share/fish/vendor_completions.d/{dunstctl,dunstify} \ + substituteInPlace \ + $out/share/zsh/site-functions/_dunstctl \ + $out/share/bash-completion/completions/dunstctl \ + $out/share/fish/vendor_completions.d/{dunstctl,dunstify}.fish \ --replace-fail "jq" "${lib.getExe jq}" ''; - passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + updateScript = nix-update-script { }; + }; - meta = with lib; { + meta = { description = "Lightweight and customizable notification daemon"; homepage = "https://dunst-project.org/"; - license = licenses.bsd3; - # NOTE: 'unix' or even 'all' COULD work too, I'm not sure - platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar gepbird ]; + license = lib.licenses.bsd3; mainProgram = "dunst"; + maintainers = with lib.maintainers; [ + domenkozar + gepbird + ]; + # NOTE: 'unix' or even 'all' COULD work too, I'm not sure + platforms = lib.platforms.linux; }; })