From dbdc1cee5bbd43215a1c0fafe303cf60ac84c01c Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 7 Dec 2024 22:01:09 -0500 Subject: [PATCH 1/4] mpris-timer: add updateScript --- pkgs/by-name/mp/mpris-timer/package.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mp/mpris-timer/package.nix b/pkgs/by-name/mp/mpris-timer/package.nix index be05cae32f6c..97545feb7285 100644 --- a/pkgs/by-name/mp/mpris-timer/package.nix +++ b/pkgs/by-name/mp/mpris-timer/package.nix @@ -1,14 +1,15 @@ { lib, + alsa-lib, buildGoModule, fetchFromGitHub, - pkg-config, glib, - wrapGAppsHook4, - alsa-lib, gobject-introspection, gtk4, libadwaita, + nix-update-script, + pkg-config, + wrapGAppsHook4, }: buildGoModule rec { @@ -21,6 +22,7 @@ buildGoModule rec { rev = "refs/tags/${version}"; hash = "sha256-Ak9DASAfW+dOhfbQDRAZJ1YD8j5Fcpz05jlXlUG1ydo="; }; + vendorHash = "sha256-APcQgNEn7ULIjBk7f4q6MMSX9k58+F7vzgUDiIZ3Jxc="; strictDeps = true; @@ -42,6 +44,7 @@ buildGoModule rec { "-s" "-w" ]; + tags = [ "wayland" ]; @@ -54,6 +57,10 @@ buildGoModule rec { glib-compile-schemas $out/share/glib-2.0/schemas ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Timer app with seamless GNOME integration"; homepage = "https://github.com/efogdev/mpris-timer"; From 9bec61285e3cc19026c1f74414d3fbf2253fcd22 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 8 Dec 2024 03:02:05 +0000 Subject: [PATCH 2/4] mpris-timer: 1.1.1 -> 1.5 Diff: https://github.com/efogdev/mpris-timer/compare/1.1.1...1.5 --- pkgs/by-name/mp/mpris-timer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mp/mpris-timer/package.nix b/pkgs/by-name/mp/mpris-timer/package.nix index 97545feb7285..2e1ad0532330 100644 --- a/pkgs/by-name/mp/mpris-timer/package.nix +++ b/pkgs/by-name/mp/mpris-timer/package.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "mpris-timer"; - version = "1.1.1"; + version = "1.5"; src = fetchFromGitHub { owner = "efogdev"; repo = "mpris-timer"; rev = "refs/tags/${version}"; - hash = "sha256-Ak9DASAfW+dOhfbQDRAZJ1YD8j5Fcpz05jlXlUG1ydo="; + hash = "sha256-drp/JB7C1MMEOWbZUmrFtaEDRpgf90MSR6dFqdagCpI="; }; vendorHash = "sha256-APcQgNEn7ULIjBk7f4q6MMSX9k58+F7vzgUDiIZ3Jxc="; From 71fb526a35c2a30263f1cc8eec8123e732300f0b Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 7 Dec 2024 22:34:34 -0500 Subject: [PATCH 3/4] mpris-timer: install binary under correct name --- pkgs/by-name/mp/mpris-timer/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/mp/mpris-timer/package.nix b/pkgs/by-name/mp/mpris-timer/package.nix index 2e1ad0532330..2b1af2994b70 100644 --- a/pkgs/by-name/mp/mpris-timer/package.nix +++ b/pkgs/by-name/mp/mpris-timer/package.nix @@ -50,6 +50,8 @@ buildGoModule rec { ]; postInstall = '' + mv $out/bin/cmd $out/bin/mpris-timer + install -Dm644 internal/ui/res/icon.svg $out/share/icons/hicolor/scalable/apps/io.github.efogdev.mpris-timer.svg install -Dm644 misc/io.github.efogdev.mpris-timer.desktop -t $out/share/applications install -Dm644 misc/io.github.efogdev.mpris-timer.metainfo.xml -t $out/share/metainfo From 8e6d6fdcb8b2882933b87848c78869c7a3726e96 Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 7 Dec 2024 22:36:27 -0500 Subject: [PATCH 4/4] mpris-timer: restrict platforms to linux --- pkgs/by-name/mp/mpris-timer/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/mp/mpris-timer/package.nix b/pkgs/by-name/mp/mpris-timer/package.nix index 2b1af2994b70..386d54e23ad6 100644 --- a/pkgs/by-name/mp/mpris-timer/package.nix +++ b/pkgs/by-name/mp/mpris-timer/package.nix @@ -72,5 +72,7 @@ buildGoModule rec { getchoo ]; mainProgram = "mpris-timer"; + # Always uses ALSA + platforms = lib.platforms.linux; }; }