diff options
| author | Pascal Wittmann <PascalWittmann@gmx.net> | 2015-07-04 23:37:27 +0200 |
|---|---|---|
| committer | Pascal Wittmann <PascalWittmann@gmx.net> | 2015-07-04 23:37:27 +0200 |
| commit | 0f2f98fbfe85e01618acf25c628d128cb9750b52 (patch) | |
| tree | b5c15a2314d7883b8cbbab1c4dbcb989d226d713 /pkgs/applications/editors | |
| parent | 2d99759e51b3ffef1e85d936041c881a218365ce (diff) | |
| parent | 278287a99b8f042ca268485b4ee27940937ad8ad (diff) | |
| download | nixlib-0f2f98fbfe85e01618acf25c628d128cb9750b52.tar nixlib-0f2f98fbfe85e01618acf25c628d128cb9750b52.tar.gz nixlib-0f2f98fbfe85e01618acf25c628d128cb9750b52.tar.bz2 nixlib-0f2f98fbfe85e01618acf25c628d128cb9750b52.tar.lz nixlib-0f2f98fbfe85e01618acf25c628d128cb9750b52.tar.xz nixlib-0f2f98fbfe85e01618acf25c628d128cb9750b52.tar.zst nixlib-0f2f98fbfe85e01618acf25c628d128cb9750b52.zip | |
Merge pull request #8610 from datakurre/datakurre-master-emacs
emacs: fix to use \${gettext}/share/locale/locale.aliasDiffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/emacs-24/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index e0439f45a9c4..5d6d576af8ea 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d -, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif +, pkgconfig, gettext, gtk, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , alsaLib, cairo, acl, gpm , withX ? !stdenv.isDarwin @@ -35,8 +35,12 @@ stdenv.mkDerivation rec { ./at-fdcwd.patch ]; + postPatch = '' + sed -i 's|/usr/share/locale|${gettext}/share/locale|g' lisp/international/mule-cmds.el + ''; + buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm ] + [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext ] ++ stdenv.lib.optional stdenv.isLinux dbus ++ stdenv.lib.optionals withX [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft |