diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-08-13 18:46:17 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-08-15 18:21:18 +0000 |
| commit | 8ea8186f18755daea48b3e7622180047e12ca94e (patch) | |
| tree | 5f8c8b0438ae5a7f42c886fe98dcc0815c44caef /overlays | |
| parent | 57b85b7ad0a0a1f06a9272c05a725158c1061659 (diff) | |
| download | nixlib-8ea8186f18755daea48b3e7622180047e12ca94e.tar nixlib-8ea8186f18755daea48b3e7622180047e12ca94e.tar.gz nixlib-8ea8186f18755daea48b3e7622180047e12ca94e.tar.bz2 nixlib-8ea8186f18755daea48b3e7622180047e12ca94e.tar.lz nixlib-8ea8186f18755daea48b3e7622180047e12ca94e.tar.xz nixlib-8ea8186f18755daea48b3e7622180047e12ca94e.tar.zst nixlib-8ea8186f18755daea48b3e7622180047e12ca94e.zip | |
emacs-pgtk: use same patches as emacs
Patches had to be rebased.
Diffstat (limited to 'overlays')
3 files changed, 31 insertions, 1 deletions
diff --git a/overlays/patches/nixpkgs-wayland/pkgs/emacs/clean-env.patch b/overlays/patches/nixpkgs-wayland/pkgs/emacs/clean-env.patch new file mode 100644 index 000000000000..98d38f8b597c --- /dev/null +++ b/overlays/patches/nixpkgs-wayland/pkgs/emacs/clean-env.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 +@@ -572,7 +572,7 @@ emacs$(EXEEXT): temacs$(EXEEXT) \ + lisp.mk $(etc)/DOC $(lisp) \ + $(lispsource)/international/charprop.el ${charsets} + ifeq ($(DUMPING),unexec) +- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump ++ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump + ifneq ($(PAXCTL_dumped),) + $(PAXCTL_dumped) emacs$(EXEEXT) + endif diff --git a/overlays/patches/nixpkgs-wayland/pkgs/emacs/default.nix b/overlays/patches/nixpkgs-wayland/pkgs/emacs/default.nix index d36f138b099a..7e922b9117b6 100644 --- a/overlays/patches/nixpkgs-wayland/pkgs/emacs/default.nix +++ b/overlays/patches/nixpkgs-wayland/pkgs/emacs/default.nix @@ -18,5 +18,8 @@ in buildInputs = old.buildInputs ++ [ cairo ]; - patches = []; + patches = [ + ./clean-env.patch + ./tramp-detect-wrapped-gvfsd.patch + ]; }) diff --git a/overlays/patches/nixpkgs-wayland/pkgs/emacs/tramp-detect-wrapped-gvfsd.patch b/overlays/patches/nixpkgs-wayland/pkgs/emacs/tramp-detect-wrapped-gvfsd.patch new file mode 100644 index 000000000000..31ba4ff75778 --- /dev/null +++ b/overlays/patches/nixpkgs-wayland/pkgs/emacs/tramp-detect-wrapped-gvfsd.patch @@ -0,0 +1,12 @@ +diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el +index 6467d8f88b..2163c28af6 100644 +--- a/lisp/net/tramp-gvfs.el ++++ b/lisp/net/tramp-gvfs.el +@@ -127,6 +127,7 @@ + (or ;; Until Emacs 25, `process-attributes' could crash Emacs + ;; for some processes. Better we don't check. + (<= emacs-major-version 25) ++ (tramp-process-running-p ".gvfds-fuse-wrapped") + (tramp-process-running-p "gvfs-fuse-daemon") + (tramp-process-running-p "gvfsd-fuse")))) + "Non-nil when GVFS is available.") |