From 8520ec0059c3835a0ccfc2294f9da8337abdd7bc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 27 Dec 2020 04:20:00 -0500 Subject: [PATCH 1/6] pcaudiolib: enable on darwin --- pkgs/development/libraries/pcaudiolib/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 12def747361..b418f68ddc8 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake which libtool pkgconfig ]; - buildInputs = [ portaudio alsaLib ] ++ lib.optional pulseaudioSupport libpulseaudio; + buildInputs = [ portaudio ] + ++ lib.optionals stdenv.isLinux [ alsaLib ] + ++ lib.optionals pulseaudioSupport [ libpulseaudio ]; preConfigure = "./autogen.sh"; @@ -25,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rhdunn/pcaudiolib"; license = licenses.gpl3; maintainers = with maintainers; [ aske ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From c9e2ce3d837ec9e66a41dd69cd35517e2ed6f919 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 27 Dec 2020 04:21:00 -0500 Subject: [PATCH 2/6] pcaudiolib: fix homepage --- pkgs/development/libraries/pcaudiolib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index b418f68ddc8..e9c5301aac5 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchFromGitHub { - owner = "rhdunn"; + owner = "espeak-ng"; repo = "pcaudiolib"; rev = version; sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Provides a C API to different audio devices"; - homepage = "https://github.com/rhdunn/pcaudiolib"; + homepage = "https://github.com/espeak-ng/pcaudiolib"; license = licenses.gpl3; maintainers = with maintainers; [ aske ]; platforms = platforms.all; From 7ad26114959eaa2992baf0e15e00ac6aec80868f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 27 Dec 2020 04:22:00 -0500 Subject: [PATCH 3/6] sonic: install manpage --- pkgs/development/libraries/sonic/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index 41b88b7f310..a868400c97b 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw }: +{ stdenv, fetchFromGitHub, fftw, installShellFiles }: stdenv.mkDerivation { pname = "sonic"; @@ -15,8 +15,14 @@ stdenv.mkDerivation { sed -i "s,^PREFIX=.*,PREFIX=$out," Makefile ''; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ fftw ]; + postInstall = '' + installManPage sonic.1 + ''; + meta = with stdenv.lib; { description = "Simple library to speed up or slow down speech"; homepage = "https://github.com/waywardgeek/sonic"; From 3ef18945f8e447c23b33fbc91368b0218f7046fe Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 27 Dec 2020 04:23:00 -0500 Subject: [PATCH 4/6] sonic: enable on darwin --- pkgs/development/libraries/sonic/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index a868400c97b..f5b1e515e63 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation { sha256 = "1z9qdk3pk507hdg39v2z1hanlw2wv7mhn8br4cb8qry9z9qwi87i"; }; - postPatch = '' - sed -i "s,^PREFIX=.*,PREFIX=$out," Makefile - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ]; nativeBuildInputs = [ installShellFiles ]; @@ -21,6 +19,8 @@ stdenv.mkDerivation { postInstall = '' installManPage sonic.1 + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libsonic.so.0.3.0 $out/lib/libsonic.so.0.3.0 ''; meta = with stdenv.lib; { @@ -28,6 +28,6 @@ stdenv.mkDerivation { homepage = "https://github.com/waywardgeek/sonic"; license = licenses.asl20; maintainers = with maintainers; [ aske ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From f88620ce7580c4ab0999a45af6621a856d3deb1b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 27 Dec 2020 04:24:00 -0500 Subject: [PATCH 5/6] sonic: 2018-07-06 -> 2020-12-27 --- pkgs/development/libraries/sonic/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index f5b1e515e63..fc45e220a51 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fftw, installShellFiles }: stdenv.mkDerivation { - pname = "sonic"; - version = "2018-07-06"; + pname = "sonic-unstable"; + version = "2020-12-27"; src = fetchFromGitHub { owner = "waywardgeek"; repo = "sonic"; - rev = "71c51195de71627d7443d05378c680ba756545e8"; - sha256 = "1z9qdk3pk507hdg39v2z1hanlw2wv7mhn8br4cb8qry9z9qwi87i"; + rev = "4a052d9774387a9d9b4af627f6a74e1694419960"; + sha256 = "0ah54nizb6iwcx277w104wsfnx05vrp4sh56d2pfxhf8xghg54m6"; }; makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ]; From 2cc63fa4ca9ad125439dd4dca615722be4d9e345 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 27 Dec 2020 04:25:00 -0500 Subject: [PATCH 6/6] espeak-ng: enable on darwin --- pkgs/applications/audio/espeak-ng/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 32cec811d00..a284be43832 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -21,15 +21,16 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng ''; meta = with stdenv.lib; { description = "Open source speech synthesizer that supports over 70 languages, based on eSpeak"; - homepage = src.meta.homepage; + homepage = "https://github.com/espeak-ng/espeak-ng"; + changelog = "https://github.com/espeak-ng/espeak-ng/blob/${version}/CHANGELOG.md"; license = licenses.gpl3; maintainers = with maintainers; [ aske ]; - platforms = platforms.linux; + platforms = platforms.all; }; }