From e6c63e9fc7abda96d657618ffc159fe317786f20 Mon Sep 17 00:00:00 2001 From: SLNOS Date: Thu, 1 Mar 2018 00:00:00 +0000 Subject: [PATCH] flite: 2.0 -> 2.1, switch to fetchFromGitHub, enable ALSA --- pkgs/development/libraries/flite/default.nix | 19 ++++++++++++------- .../libraries/flite/fix-rpath.patch | 5 ----- 2 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 pkgs/development/libraries/flite/fix-rpath.patch diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index 31dad5e255af..0b4172cdc764 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, alsaLib }: stdenv.mkDerivation rec { - name = "flite-2.0.0"; + name = "flite-2.1.0"; - src = fetchurl { - url = "http://www.festvox.org/flite/packed/flite-2.0/${name}-release.tar.bz2"; - sha256 = "04g4r83jh4cl0irc8bg7njngcah7749956v9s6sh552kzmh3i337"; + src = fetchFromGitHub { + owner = "festvox"; + repo = "flite"; + rev = "d673f65b2c4a8cd3da7447079309a6dc4bcf1a5e"; + sha256 = "1kx43jvdln370590gfjhxxz3chxfi6kq18504wmdpljib2l0grjq"; }; - patches = [ ./fix-rpath.patch ]; + buildInputs = [ alsaLib ]; - configureFlags = [ "--enable-shared" ]; + configureFlags = [ + "--enable-shared" + "--with-audio=alsa" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/flite/fix-rpath.patch b/pkgs/development/libraries/flite/fix-rpath.patch deleted file mode 100644 index be774147c3f0..000000000000 --- a/pkgs/development/libraries/flite/fix-rpath.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/main/Makefile -+++ b/main/Makefile -@@ -81 +80,1 @@ ifdef SHFLAGS --flite_LIBS_flags += -Wl,-rpath $(LIBDIR) -+flite_LIBS_flags += -Wl,-rpath,$(INSTALLLIBDIR)