diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix index eab22ba075df..68a108e8b2ff 100644 --- a/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/pkgs/by-name/sp/speakersafetyd/package.nix @@ -11,20 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "speakersafetyd"; - version = "1.1.2"; + version = "1.1.2-unstable-2026-03-28"; src = fetchFromGitHub { owner = "AsahiLinux"; repo = "speakersafetyd"; - tag = finalAttrs.version; - hash = "sha256-sSGoF2c5HfPM2FBrBJwJ9NvExYijGx6JH1bJp3epfe0="; + rev = "a97c341e39e3f89e99f65d2a35d4e060b3b0168a"; + hash = "sha256-FWpO2cp8licwevpAP25fmiIUEehkQp61E4A7RmsKJH0="; }; - cargoHash = "sha256-9XbrIY1VwnHtqi/ZfS952SyjNjA/TJRdOqCsPReZI8o="; - - patches = [ - ./remove-install-paths.patch - ]; + cargoHash = "sha256-xcCnzDN/U3sp12UwznaYjalzcKxo8Eo4vHnO/Sf++Zk="; nativeBuildInputs = [ pkg-config @@ -34,8 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: { postPatch = '' substituteInPlace speakersafetyd.service \ - --replace-fail "User=speakersafetyd" \ - "" \ --replace-fail "/usr" \ "$out" @@ -50,7 +44,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "UNITDIR=lib/systemd/system" "UDEVDIR=lib/udev/rules.d" "SHAREDIR=share" - "TMPFILESDIR=lib/tmpfiles.d" ]; dontCargoInstall = true; diff --git a/pkgs/by-name/sp/speakersafetyd/remove-install-paths.patch b/pkgs/by-name/sp/speakersafetyd/remove-install-paths.patch deleted file mode 100644 index 9581dc7ca1e5..000000000000 --- a/pkgs/by-name/sp/speakersafetyd/remove-install-paths.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Makefile b/Makefile -index 41bf7b4..ca14be7 100644 ---- a/Makefile -+++ b/Makefile -@@ -24,11 +24,8 @@ install-data: - install -pm0644 95-speakersafetyd.rules $(DESTDIR)/$(UDEVDIR)/95-speakersafetyd.rules - install -dDm0755 $(DESTDIR)/$(SHAREDIR)/speakersafetyd/apple - install -pm0644 -t $(DESTDIR)/$(SHAREDIR)/speakersafetyd/apple $(wildcard conf/apple/*) -- install -dDm0755 -o $(SPEAKERSAFETYD_USER) -g $(SPEAKERSAFETYD_GROUP) $(DESTDIR)/$(VARDIR)/lib/speakersafetyd -- install -dDm0700 -o $(SPEAKERSAFETYD_USER) -g $(SPEAKERSAFETYD_GROUP) $(DESTDIR)/$(VARDIR)/lib/speakersafetyd/blackbox - install -dDm0755 $(DESTDIR)/$(TMPFILESDIR) - install -pm0644 speakersafetyd.tmpfiles $(DESTDIR)/$(TMPFILESDIR)/speakersafetyd.conf -- install -dDm0755 -o $(SPEAKERSAFETYD_USER) -g $(SPEAKERSAFETYD_GROUP) $(DESTDIR)/run/speakersafetyd - - uninstall: - rm -f $(DESTDIR)/$(BINDIR)/speakersafetyd $(DESTDIR)/$(UNITDIR)/speakersafetyd.service $(DESTDIR)/$(UDEVDIR)/95-speakersafetyd.rules $(DESTDIR)/$(TMPFILESDIR)/speakersafetyd.conf