diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:31 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:49 +0200 |
| commit | f64d84698eb3f4d833e846336ff99a73331c31f7 (patch) | |
| tree | 1120886b680851bc8b8f8d337af3503ecd4a3d71 /pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch | |
| parent | 3e4a382d6753a057256c7ef1e9f52ae9e07bd677 (diff) | |
| parent | 30431e71608576baf880567b2894ad2a542f8d5e (diff) | |
| download | nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.gz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.bz2 nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.lz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.xz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.zst nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/applications/audio/espeak/edit.nix 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-configurable-path-espeak-data.patch')
| -rw-r--r-- | pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch b/pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch new file mode 100644 index 000000000000..e5c761a11b35 --- /dev/null +++ b/pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch @@ -0,0 +1,15 @@ +Don't hardcode /usr, use @prefix@. + +Author: Bjørn Forsman +diff -uNr espeakedit-1.48.03.orig/src/speech.h espeakedit-1.48.03/src/speech.h +--- espeakedit-1.48.03.orig/src/speech.h 2014-03-04 17:48:12.000000000 +0100 ++++ espeakedit-1.48.03/src/speech.h 2014-07-22 18:21:40.860790719 +0200 +@@ -58,7 +58,7 @@ + + // will look for espeak_data directory here, and also in user's home directory + #ifndef PATH_ESPEAK_DATA +- #define PATH_ESPEAK_DATA "/usr/share/espeak-data" ++ #define PATH_ESPEAK_DATA "@prefix@/share/espeak-data" + #endif + + typedef unsigned short USHORT; |