From 8361b82d0ac59f436f7ecef283077b0f7d689ca1 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 10 Apr 2021 02:13:18 +0200 Subject: refactor(third_party): Consistent use of depot.third_party vs. pkgs In preparation for the solution of b/108, we need to consistently use `depot.third_party` for packages that are only packed in the TVL depot and `pkgs` for things that come from nixpkgs. This commit cleans up a huge chunk of these uses in //third_party Change-Id: Ic382c0cdea7330a84d5f0b7d109c824ddceb94e7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2912 Tested-by: BuildkiteCI Reviewed-by: sterni --- tools/nsfv-setup/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tools/nsfv-setup/default.nix') diff --git a/tools/nsfv-setup/default.nix b/tools/nsfv-setup/default.nix index f4dd6c4dd1..98dcc61b7b 100644 --- a/tools/nsfv-setup/default.nix +++ b/tools/nsfv-setup/default.nix @@ -10,10 +10,11 @@ # # If this script is run while an NSFV sink exists, the existing sink # will first be removed. -{ pkgs, ... }: +{ depot, pkgs, ... }: let - inherit (pkgs) ripgrep pulseaudio nsfv; + inherit (pkgs) ripgrep pulseaudio; + inherit (depot.third_party) nsfv; in pkgs.writeShellScriptBin "nsfv-setup" '' export PATH="${ripgrep}/bin:${pulseaudio}/bin:$PATH" @@ -23,5 +24,5 @@ in pkgs.writeShellScriptBin "nsfv-setup" '' SINK=$(${pulseaudio}/bin/pacmd info | ${ripgrep}/bin/rg -r '$1' '^Default sink name: (.*)$') echo "Setting up NSFV filtering to sink ''${SINK}" - ${pulseaudio}/bin/pacmd load-module module-ladspa-sink sink_name=NSFV sink_master=''${SINK} label=noise_suppressor_mono plugin=${pkgs.nsfv}/lib/ladspa/librnnoise_ladspa.so control=42 rate=48000 + ${pulseaudio}/bin/pacmd load-module module-ladspa-sink sink_name=NSFV sink_master=''${SINK} label=noise_suppressor_mono plugin=${nsfv}/lib/ladspa/librnnoise_ladspa.so control=42 rate=48000 '' -- cgit 1.4.1