alsaequal: 0.6 -> 0.7.1 (#349355)

NixOS · Oct 30, 2024 · 6531b95 · 6531b95
2 parents 6745c25 + ad9cfe3
commit 6531b95
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 50 deletions.
diff --git a/pkgs/tools/audio/alsaequal/caps_9.x.patch b/pkgs/tools/audio/alsaequal/caps_9.x.patch
diff --git a/pkgs/tools/audio/alsaequal/default.nix b/pkgs/tools/audio/alsaequal/default.nix
@@ -1,17 +1,23 @@
-{ lib, stdenv, fetchurl
-, alsa-lib, caps
+{ lib, stdenv, fetchFromGitHub
+, alsa-lib, caps,
+  ladspaH
 }:
 
 stdenv.mkDerivation rec {
   pname = "alsaequal";
-  version = "0.6";
+  version = "0.7.1";
 
-  src = fetchurl {
-    url = "https://thedigitalmachine.net/tools/alsaequal-${version}.tar.bz2";
-    sha256 = "1w3g9q5z3nrn3mwdhaq6zsg0jila8d102dgwgrhj9vfx58apsvli";
+  src = fetchFromGitHub {
+    owner = "bassdr";
+    repo = "alsaequal";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-jI+w/jCFslQSNeIS7mwb+LZSawU4XjbSNNgpvuShH1g=";
   };
 
-  buildInputs = [ alsa-lib ];
+  buildInputs = [
+    alsa-lib
+    ladspaH
+  ];
 
   makeFlags = [ "DESTDIR=$(out)" ];
 
@@ -20,10 +26,6 @@ stdenv.mkDerivation rec {
     # Adds executable permissions to resulting libraries
     # and changes their destination directory from "usr/lib/alsa-lib" to "lib/alsa-lib" to better align with nixpkgs filesystem hierarchy.
     ./makefile.patch
-    # Fixes control port check, which resulted in false error.
-    ./false_error.patch
-    # Fixes name change of an "Eq" to "Eq10" method in version 9 of caps library.
-    ./caps_9.x.patch
   ];
 
   postPatch = ''
@@ -36,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Real-time adjustable equalizer plugin for ALSA";
-    homepage = "https://thedigitalmachine.net/alsaequal.html";
+    homepage = "https://github.com/bassdr/alsaequal";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ ymeister ];
   };

diff --git a/pkgs/tools/audio/alsaequal/false_error.patch b/pkgs/tools/audio/alsaequal/false_error.patch
diff --git a/pkgs/tools/audio/alsaequal/makefile.patch b/pkgs/tools/audio/alsaequal/makefile.patch
@@ -4,10 +4,12 @@
 
  install: all
  	@echo Installing...
--	$(Q)install -m 644 $(SND_PCM_BIN) ${DESTDIR}/usr/lib/alsa-lib/
--	$(Q)install -m 644 $(SND_CTL_BIN) ${DESTDIR}/usr/lib/alsa-lib/
-+	$(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/lib/alsa-lib/
-+	$(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/lib/alsa-lib/
+-	$(Q)mkdir -p ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/
+-	$(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/
+-	$(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/
++	$(Q)mkdir -p ${DESTDIR}/$(LIBDIR)/alsa-lib/
++	$(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/$(LIBDIR)/alsa-lib/
++	$(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/$(LIBDIR)/alsa-lib/
 
  uninstall:
  	@echo Un-installing...