diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-02 05:08:07 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-02 05:08:07 +0200 |
commit | 6295a3ca36cc746e11c7b01fd47562fde3a703ec (patch) | |
tree | 18d9289564e8893a9d7e4df671e5226bcd2b0f0c /pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch | |
parent | 91b53aaebc0ca2e80d073459324515879e300f34 (diff) | |
parent | fb565f1a4ea2a71debe48e206ef6c2d032bba0a3 (diff) | |
download | nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.gz nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.bz2 nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.lz nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.xz nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.zst nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.zip |
Merge recent master into x-updates
Hydra: ?compare=1142825 Conflicts (easy): pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix
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 00000000000..9f8a65d2b0c --- /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` \ |