From d1ad5dd375267e9000d45c0bfd9ff60c103a37a1 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Mon, 9 Sep 2024 23:58:59 +0200 Subject: [PATCH 1/2] mako: include systemd user service --- pkgs/by-name/ma/mako/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/ma/mako/package.nix b/pkgs/by-name/ma/mako/package.nix index dbd6b7a08f77..a7c410be4dc2 100644 --- a/pkgs/by-name/ma/mako/package.nix +++ b/pkgs/by-name/ma/mako/package.nix @@ -44,6 +44,13 @@ stdenv.mkDerivation (finalAttrs: { ) ''; + postInstall = '' + mkdir -p $out/lib/systemd/user + substitute $src/contrib/systemd/mako.service $out/lib/systemd/user/mako.service \ + --replace-fail '/usr/bin' "$out/bin" + chmod 0644 $out/lib/systemd/user/mako.service + ''; + meta = { description = "Lightweight Wayland notification daemon"; homepage = "https://wayland.emersion.fr/mako/"; From df4c70151ef7478a8fde9a3a3c9434e99cc5ec63 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Mon, 9 Sep 2024 23:59:36 +0200 Subject: [PATCH 2/2] mako: format using nixfmt --- pkgs/by-name/ma/mako/package.nix | 66 ++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/ma/mako/package.nix b/pkgs/by-name/ma/mako/package.nix index a7c410be4dc2..3ff46c8b477b 100644 --- a/pkgs/by-name/ma/mako/package.nix +++ b/pkgs/by-name/ma/mako/package.nix @@ -1,20 +1,21 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, scdoc -, systemd -, pango -, cairo -, gdk-pixbuf -, jq -, bash -, wayland -, wayland-scanner -, wayland-protocols -, wrapGAppsHook3 +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + scdoc, + systemd, + pango, + cairo, + gdk-pixbuf, + jq, + bash, + wayland, + wayland-scanner, + wayland-protocols, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { @@ -30,8 +31,22 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook3 wayland-scanner ]; - buildInputs = [ systemd pango cairo gdk-pixbuf wayland ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-protocols + wrapGAppsHook3 + wayland-scanner + ]; + buildInputs = [ + systemd + pango + cairo + gdk-pixbuf + wayland + ]; mesonFlags = [ "-Dzsh-completions=true" @@ -40,7 +55,13 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ systemd /* for busctl */ jq bash ]}" + --prefix PATH : "${ + lib.makeBinPath [ + systemd # for busctl + jq + bash + ] + }" ) ''; @@ -55,7 +76,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Lightweight Wayland notification daemon"; homepage = "https://wayland.emersion.fr/mako/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dywedir synthetica ]; + maintainers = with lib.maintainers; [ + dywedir + synthetica + ]; platforms = lib.platforms.linux; mainProgram = "mako"; };