diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-19 22:50:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-19 22:50:30 -0500 |
| commit | d6d5795ed9dd0cf246a9fa25fb034164527a2ed8 (patch) | |
| tree | 198e9c148d6d4e5e00e38acdadd3cc90ec1a9ac3 /pkgs/applications/editors | |
| parent | 7e78ddbf03b81a38e3ad6f308e1805aa2999a0ef (diff) | |
| parent | 5af6e9f75e89dab40b2ac9cb9b0fe92cc66f1311 (diff) | |
| download | nixlib-d6d5795ed9dd0cf246a9fa25fb034164527a2ed8.tar nixlib-d6d5795ed9dd0cf246a9fa25fb034164527a2ed8.tar.gz nixlib-d6d5795ed9dd0cf246a9fa25fb034164527a2ed8.tar.bz2 nixlib-d6d5795ed9dd0cf246a9fa25fb034164527a2ed8.tar.lz nixlib-d6d5795ed9dd0cf246a9fa25fb034164527a2ed8.tar.xz nixlib-d6d5795ed9dd0cf246a9fa25fb034164527a2ed8.tar.zst nixlib-d6d5795ed9dd0cf246a9fa25fb034164527a2ed8.zip | |
Merge pull request #54916 from pbogdan/emacs-xcursor
emacs: link libXcursor when using lucid toolkit
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 4f268a3a104e..4a48cde571ae 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d +{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, libXcursor , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO, m17n_lib, libotf @@ -118,6 +118,17 @@ stdenv.mkDerivation rec { mv nextstep/Emacs.app $out/Applications ''; + postFixup = + let libPath = lib.makeLibraryPath [ + libXcursor + ]; + in lib.optionalString (withX && toolkit == "lucid") '' + patchelf --set-rpath \ + "$(patchelf --print-rpath "$out/bin/emacs"):${libPath}" \ + "$out/bin/emacs" + patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs" + ''; + meta = with stdenv.lib; { description = "The extensible, customizable GNU text editor"; homepage = https://www.gnu.org/software/emacs/; |