From 1328c5d95d3f83a910673a81854b7faac2cd9d12 Mon Sep 17 00:00:00 2001 From: Reed Date: Thu, 17 Dec 2020 10:41:37 -0500 Subject: [PATCH] noisetorch: 0.8.2 -> 0.9.0 --- pkgs/applications/audio/noisetorch/default.nix | 8 +++++--- .../audio/noisetorch/embedlibrnnoise.patch | 13 ------------- 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 pkgs/applications/audio/noisetorch/embedlibrnnoise.patch diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index 1932f239cfd..1796927f529 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "NoiseTorch"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lawl"; repo = "NoiseTorch"; rev = version; - sha256 = "14i04rmraxbddcvk0k9c6ak9invln7002g5jms54kcjzv9p39hbf"; + sha256 = "1a4g112h83m55pga8kq2a1wzxpycj59v4bygyjfyi1s09q1y97qg"; }; - patches = [ ./version.patch ./embedlibrnnoise.patch ]; + patches = [ ./version.patch ]; vendorSha256 = null; @@ -21,6 +21,8 @@ buildGoModule rec { buildInputs = [ rnnoise-plugin ]; + postPatch = "substituteInPlace main.go --replace 'librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so' '$RNNOISE_LADSPA_PLUGIN'"; + preBuild = '' export RNNOISE_LADSPA_PLUGIN="${rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"; go generate; diff --git a/pkgs/applications/audio/noisetorch/embedlibrnnoise.patch b/pkgs/applications/audio/noisetorch/embedlibrnnoise.patch deleted file mode 100644 index b1782efb8b3..00000000000 --- a/pkgs/applications/audio/noisetorch/embedlibrnnoise.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scripts/embedlibrnnoise.go b/scripts/embedlibrnnoise.go -index 43daf80..0b3004b 100644 ---- a/scripts/embedlibrnnoise.go -+++ b/scripts/embedlibrnnoise.go -@@ -8,7 +8,7 @@ import ( - ) - - func main() { -- b, err := ioutil.ReadFile("librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so") -+ b, err := ioutil.ReadFile(os.Getenv("RNNOISE_LADSPA_PLUGIN")) - if err != nil { - fmt.Printf("Couldn't read librnnoise_ladspa.so: %v\n", err) - os.Exit(1)