From 93aeabb55a49d6ed147405ce308535fa2eea6e3a Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 26 Sep 2022 23:27:42 +0800 Subject: [PATCH] espeak-ng: 1.50 -> 1.51 --- pkgs/applications/audio/espeak-ng/default.nix | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 6458d7188ae1..84eb4e1d39c9 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -1,18 +1,30 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkg-config -, ronn, substituteAll -, mbrolaSupport ? true, mbrola -, pcaudiolibSupport ? true, pcaudiolib -, sonicSupport ? true, sonic }: +{ stdenv +, lib +, fetchFromGitHub +, autoconf +, automake +, which +, libtool +, pkg-config +, ronn +, substituteAll +, mbrolaSupport ? true +, mbrola +, pcaudiolibSupport ? true +, pcaudiolib +, sonicSupport ? true +, sonic +}: stdenv.mkDerivation rec { pname = "espeak-ng"; - version = "1.50"; + version = "1.51"; src = fetchFromGitHub { owner = "espeak-ng"; repo = "espeak-ng"; rev = version; - sha256 = "0jkqhf2h94vbqq7mg7mmm23bq372fa7mdk941my18c3vkldcir1b"; + hash = "sha256-KwzMlQ3/JgpNOpuV4zNc0zG9oWEGFbVSJ4bEd3dtD3Y="; }; patches = lib.optionals mbrolaSupport [ @@ -26,8 +38,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake which libtool pkg-config ronn ]; buildInputs = lib.optional mbrolaSupport mbrola - ++ lib.optional pcaudiolibSupport pcaudiolib - ++ lib.optional sonicSupport sonic; + ++ lib.optional pcaudiolibSupport pcaudiolib + ++ lib.optional sonicSupport sonic; preConfigure = "./autogen.sh"; @@ -35,12 +47,6 @@ stdenv.mkDerivation rec { "--with-mbrola=${if mbrolaSupport then "yes" else "no"}" ]; - # Current release lacks dependencies on local espeak-ng: - # cd dictsource && ESPEAK_DATA_PATH=/build/espeak-ng LD_LIBRARY_PATH=../src: ../src/espeak-ng --compile=yue && cd .. - # bash: line 1: ../src/espeak-ng: No such file or directory - # Should be fixed in next release: https://github.com/espeak-ng/espeak-ng/pull/1029 - enableParallelBuilding = false; - postInstall = lib.optionalString stdenv.isLinux '' patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng '';