diff options
| author | adisbladis <adisbladis@gmail.com> | 2020-08-21 00:58:17 +0200 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2020-08-21 00:58:17 +0200 |
| commit | edd6216a00437161ddbb658f6d9c9271daa70942 (patch) | |
| tree | 1eedbeaf12d5697e4078747c49189e9edea7bb36 /pkgs/applications/editors | |
| parent | 967259e6b495c19aa367d598e8d20d73475d2cfc (diff) | |
| download | nixpkgs-edd6216a00437161ddbb658f6d9c9271daa70942.tar nixpkgs-edd6216a00437161ddbb658f6d9c9271daa70942.tar.gz nixpkgs-edd6216a00437161ddbb658f6d9c9271daa70942.tar.bz2 nixpkgs-edd6216a00437161ddbb658f6d9c9271daa70942.tar.lz nixpkgs-edd6216a00437161ddbb658f6d9c9271daa70942.tar.xz nixpkgs-edd6216a00437161ddbb658f6d9c9271daa70942.tar.zst nixpkgs-edd6216a00437161ddbb658f6d9c9271daa70942.zip | |
emacs26: Add back at version 26.3
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/emacs/26.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs/clean-env-26.patch | 15 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch | 14 |
3 files changed, 37 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs/26.nix b/pkgs/applications/editors/emacs/26.nix new file mode 100644 index 00000000000..a151006a995 --- /dev/null +++ b/pkgs/applications/editors/emacs/26.nix @@ -0,0 +1,8 @@ +import ./generic.nix (rec { + version = "26.3"; + sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"; + patches = [ + ./clean-env-26.patch + ./tramp-detect-wrapped-gvfsd-26.patch + ]; +}) diff --git a/pkgs/applications/editors/emacs/clean-env-26.patch b/pkgs/applications/editors/emacs/clean-env-26.patch new file mode 100644 index 00000000000..88befda899a --- /dev/null +++ b/pkgs/applications/editors/emacs/clean-env-26.patch @@ -0,0 +1,15 @@ +Dump temacs in an empty environment to prevent -dev paths from ending +up in the dumped image. + +diff --git a/src/Makefile.in b/src/Makefile.in +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -535,7 +535,7 @@ ifeq ($(CANNOT_DUMP),yes) + ln -f temacs$(EXEEXT) $@ + else + unset EMACS_HEAP_EXEC; \ +- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump ++ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump + ifneq ($(PAXCTL_dumped),) + $(PAXCTL_dumped) $@ + endif diff --git a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch new file mode 100644 index 00000000000..5d16194fd20 --- /dev/null +++ b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch @@ -0,0 +1,14 @@ +diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el +index f370abba31..f2806263a9 100644 +--- a/lisp/net/tramp-gvfs.el ++++ b/lisp/net/tramp-gvfs.el +@@ -164,7 +164,8 @@ tramp-gvfs-enabled + (and (featurep 'dbusbind) + (tramp-compat-funcall 'dbus-get-unique-name :system) + (tramp-compat-funcall 'dbus-get-unique-name :session) +- (or (tramp-compat-process-running-p "gvfs-fuse-daemon") ++ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped") ++ (tramp-compat-process-running-p "gvfs-fuse-daemon") + (tramp-compat-process-running-p "gvfsd-fuse")))) + "Non-nil when GVFS is available.") + |