diff options
| author | SLNOS <anonymous@wired> | 2018-03-01 00:00:00 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-03-15 05:01:47 +0000 |
| commit | e6c63e9fc7abda96d657618ffc159fe317786f20 (patch) | |
| tree | 82e5aba67e9f5c634fbae7b7dcaea61c5e3a8df1 /pkgs | |
| parent | d4be6b330e0a61f996aadf5a6cc1b2ad2f18c383 (diff) | |
| download | nixpkgs-e6c63e9fc7abda96d657618ffc159fe317786f20.tar nixpkgs-e6c63e9fc7abda96d657618ffc159fe317786f20.tar.gz nixpkgs-e6c63e9fc7abda96d657618ffc159fe317786f20.tar.bz2 nixpkgs-e6c63e9fc7abda96d657618ffc159fe317786f20.tar.lz nixpkgs-e6c63e9fc7abda96d657618ffc159fe317786f20.tar.xz nixpkgs-e6c63e9fc7abda96d657618ffc159fe317786f20.tar.zst nixpkgs-e6c63e9fc7abda96d657618ffc159fe317786f20.zip | |
flite: 2.0 -> 2.1, switch to fetchFromGitHub, enable ALSA
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/flite/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/development/libraries/flite/fix-rpath.patch | 5 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index 31dad5e255a..0b4172cdc76 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 be774147c3f..00000000000 --- 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) |