diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2013-09-02 21:53:57 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-07-22 21:33:25 +0200 |
commit | 4597903ce98dea0c66df59837c3f3d4d8d0082f7 (patch) | |
tree | 8500744bb63dfabd9feacf5e0cd8224c85a20a7c /pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch | |
parent | 62adfd8570542e3c993b30e7a1e68f06e29cadbf (diff) | |
download | nixlib-4597903ce98dea0c66df59837c3f3d4d8d0082f7.tar nixlib-4597903ce98dea0c66df59837c3f3d4d8d0082f7.tar.gz nixlib-4597903ce98dea0c66df59837c3f3d4d8d0082f7.tar.bz2 nixlib-4597903ce98dea0c66df59837c3f3d4d8d0082f7.tar.lz nixlib-4597903ce98dea0c66df59837c3f3d4d8d0082f7.tar.xz nixlib-4597903ce98dea0c66df59837c3f3d4d8d0082f7.tar.zst nixlib-4597903ce98dea0c66df59837c3f3d4d8d0082f7.zip |
espeakedit: version bump 1.46.02 -> 1.48.03 (and add to channel)
The one-liner gcc buildPhase doesn't work anymore, so I'm using upstream Makefile instead. The Makefile needs a tiny patch to work (not nixpkgs specific). Also fixup path to 'sox' and espeak-data/ (runtime deps) by providing full paths. TODO: Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought I've told it to use $espeak/share/espeak-data. Have to contact upstream to get this fixed. Workaround: cp -r $(nix-build -A espeak)/share/espeak-data ~ chmod +w ~/espeak-data
Diffstat (limited to 'pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch')
-rw-r--r-- | pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch b/pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch new file mode 100644 index 000000000000..9f8a65d2b0ca --- /dev/null +++ b/pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch @@ -0,0 +1,26 @@ +Fix broken Makefile: + +* fix syntax error (missing '\' to continue line): + Makefile:19: *** recipe commences before first target. Stop. +* Get portaudio library flags from pkg-config (to get -Lpath/to/portaudio/lib etc.) + +Author: Bjørn Forsman +diff -uNr espeakedit-1.48.03.orig/src/Makefile espeakedit-1.48.03/src/Makefile +--- espeakedit-1.48.03.orig/src/Makefile 2013-03-13 15:52:02.000000000 +0100 ++++ espeakedit-1.48.03/src/Makefile 2014-07-22 15:34:17.524114822 +0200 +@@ -12,12 +12,11 @@ + + WX_LIBS = -pthread `wx-config --libs` + +-LIBS=-lstdc++ -lportaudio ++LIBS=-lstdc++ `pkg-config --libs portaudio-2.0` + #LIBS=-lstdc++ /usr/lib/x86_64-linux-gnu/libportaudio.so.2 + +-CPPFLAGS = -Wall -g -fexceptions `wx-config --cflags` +- -I/usr/include/wx-2.8 \ +- -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES ++CPPFLAGS = -Wall -g -fexceptions `wx-config --cflags` \ ++ -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES \ + -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT + + CXXFLAGS = -O2 -Wall -fexceptions `wx-config --cflags` \ |