diff options
Diffstat (limited to 'pkgs/applications/audio/espeak')
-rw-r--r-- | pkgs/applications/audio/espeak/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/audio/espeak/edit.nix | 10 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index aa68fd5363d..675f31b478c 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, portaudio }: +{ lib, stdenv, fetchurl, unzip, portaudio }: stdenv.mkDerivation rec { name = "espeak-1.48.04"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz"; }; - buildInputs = [ unzip portaudio ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ portaudio ]; patches = [ ./gcc6.patch @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { makeFlags="PREFIX=$out DATADIR=$out/share/espeak-data" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Compact open source software speech synthesizer"; homepage = "http://espeak.sourceforge.net/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 6bcffcbc5c3..0b9fa3dfbe5 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, unzip, portaudio, wxGTK, sox }: +{ lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK, sox }: stdenv.mkDerivation rec { name = "espeakedit-1.48.03"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ unzip portaudio wxGTK ]; + nativeBuildInputs = [ pkg-config unzip ]; + buildInputs = [ portaudio wxGTK ]; # TODO: # Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { -e "s|@prefix@|$out|" \ -i "$file" done - '' + stdenv.lib.optionalString (portaudio.api_version == 19) '' + '' + lib.optionalString (portaudio.api_version == 19) '' cp src/portaudio19.h src/portaudio.h ''; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { cp src/espeakedit "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Phoneme editor for espeak"; homepage = "http://espeak.sourceforge.net/"; license = licenses.gpl3Plus; |