Unverified Commit 4ca8227f authored by Jasi's avatar Jasi
Browse files

speakersafetyd: 1.0.2 → 1.1.2

parent f6ecfe5d

pkgs/by-name/sp/speakersafetyd/package.nix

+14 −7
Original line number Diff line number Diff line
@@ -11,16 +11,20 @@ 


rustPlatform.buildRustPackage (finalAttrs: {

  pname = "speakersafetyd";

  version = "1.0.2";

  version = "1.1.2";



  src = fetchFromGitHub {

    owner = "AsahiLinux";

    repo = "speakersafetyd";

    tag = finalAttrs.version;

    hash = "sha256-ULAGdYUfeMlPki6DT2vD+tvDqKMxJtG16o/+7+ERsv4=";

    hash = "sha256-sSGoF2c5HfPM2FBrBJwJ9NvExYijGx6JH1bJp3epfe0=";

  };



  cargoHash = "sha256-DnOnqi60JsRX8yqEM/5zZ3yX/rk85/ruwL3aW1FRXKg=";

  cargoHash = "sha256-9XbrIY1VwnHtqi/ZfS952SyjNjA/TJRdOqCsPReZI8o=";



  patches = [

    ./remove-install-paths.patch

  ];



  nativeBuildInputs = [

    pkg-config
@@ -29,10 +33,13 @@ rustPlatform.buildRustPackage (finalAttrs: { 
  buildInputs = [ alsa-lib ];



  postPatch = ''

    substituteInPlace speakersafetyd.service --replace "/usr" "$out"

    substituteInPlace Makefile --replace "target/release" "target/${stdenv.hostPlatform.rust.cargoShortTarget}/$cargoBuildType"

    # creating files in /var does not make sense in a nix package

    substituteInPlace Makefile --replace 'install -dDm0755 $(DESTDIR)/$(VARDIR)/lib/speakersafetyd/blackbox' ""

    substituteInPlace speakersafetyd.service \

      --replace-fail "/usr" \

                     "$out"



    substituteInPlace Makefile \

      --replace-fail "target/release" \

                     "target/${stdenv.hostPlatform.rust.cargoShortTarget}/$cargoBuildType" \

  '';



  installFlags = [

pkgs/by-name/sp/speakersafetyd/remove-install-paths.patch

0 → 100644
+16 −0
Original line number Diff line number Diff line 
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