diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
| commit | a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e (patch) | |
| tree | 47950e79183035018882419c4eff5047d1537b99 /nixpkgs/pkgs/applications/editors/emacs | |
| parent | 5b00523fb58512232b819a301c4309f579c7f09c (diff) | |
| parent | 22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff) | |
| download | nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.gz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.bz2 nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.lz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.xz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.zst nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.zip | |
Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/emacs')
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/emacs/25.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/emacs/default.nix | 9 | ||||
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/emacs/macport.nix | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/editors/emacs/25.nix b/nixpkgs/pkgs/applications/editors/emacs/25.nix index e4643102f0ef..1ee2f5d4fe7c 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/25.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/25.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The extensible, customizable GNU text editor"; - homepage = https://www.gnu.org/software/emacs/; + homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/applications/editors/emacs/default.nix b/nixpkgs/pkgs/applications/editors/emacs/default.nix index 2b40eb77e2cf..fc00384c03ae 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm +{ stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm , Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf @@ -44,6 +44,11 @@ stdenv.mkDerivation rec { patches = [ ./clean-env.patch ./tramp-detect-wrapped-gvfsd.patch + # unbreak macOS unexec + (fetchpatch { + url = https://github.com/emacs-mirror/emacs/commit/888ffd960c06d56a409a7ff15b1d930d25c56089.patch; + sha256 = "08q3ygdigqwky70r47rcgzlkc5jy82xiq8am5kwwy891wlpl7frw"; + }) ]; postPatch = lib.optionalString srcRepo '' @@ -132,7 +137,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The extensible, customizable GNU text editor"; - homepage = https://www.gnu.org/software/emacs/; + homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley adisbladis ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/applications/editors/emacs/macport.nix b/nixpkgs/pkgs/applications/editors/emacs/macport.nix index e9307c7e80b9..1624e62026af 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/macport.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/macport.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The extensible, customizable text editor"; - homepage = https://www.gnu.org/software/emacs/; + homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jwiegley matthewbauer ]; platforms = platforms.darwin; |