commit 09e349206d4bf40092ae74c52fc93a54f27b9355 · pyrox.dev/nixpkgs

+11

pkgs/applications/editors/emacs/site-start.el

···

       22
       22
        
                                    (nix--profile-paths)))))

     

       23
       23
        
         (setq load-path (append paths load-path)))

     

       24
       24
        
       

     

       25
       25
       +
       ;;; Remove wrapper site-lisp from EMACSLOADPATH so it's not propagated

     

       26
       26
       +
       ;;; to any other Emacsen that might be started as subprocesses.

     

       27
       27
       +
       (let ((wrapper-site-lisp (getenv "emacsWithPackages_siteLisp"))

     

       28
       28
       +
             (env-load-path (getenv "EMACSLOADPATH")))

     

       29
       29
       +
         (when wrapper-site-lisp

     

       30
       30
       +
           (setenv "emacsWithPackages_siteLisp" nil))

     

       31
       31
       +
         (when (and wrapper-site-lisp env-load-path)

     

       32
       32
       +
           (let* ((env-list (split-string env-load-path ":"))

     

       33
       33
       +
                  (new-env-list (delete wrapper-site-lisp env-list)))

     

       34
       34
       +
             (setenv "EMACSLOADPATH" (when new-env-list

     

       35
       35
       +
                                       (mapconcat 'identity new-env-list ":"))))))

     

       25
       36
        
       

     

       26
       37
        
       ;;; Make `woman' find the man pages

     

       27
       38
        
       (defvar woman-manpath)

+12 -4

pkgs/build-support/emacs/wrapper.nix

···

       155
       155
        
           for prog in $emacs/bin/*; do # */

     

       156
       156
        
             local progname=$(basename "$prog")

     

       157
       157
        
             rm -f "$out/bin/$progname"

     

       158
       158
       -
             makeWrapper "$prog" "$out/bin/$progname" \

     

       159
       159
       -
               --suffix EMACSLOADPATH ":" "$deps/share/emacs/site-lisp:"

     

       158
       158
       +
       

     

       159
       159
       +
             substitute ${./wrapper.sh} $out/bin/$progname \

     

       160
       160
       +
               --subst-var-by bash ${emacs.stdenv.shell} \

     

       161
       161
       +
               --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \

     

       162
       162
       +
               --subst-var prog

     

       163
       163
       +
             chmod +x $out/bin/$progname

     

       160
       164
        
           done

     

       161
       165
        
       

     

       162
       166
        
           # Wrap MacOS app

     
···

       168
       172
        
                   $emacs/Applications/Emacs.app/Contents/PkgInfo \

     

       169
       173
        
                   $emacs/Applications/Emacs.app/Contents/Resources \

     

       170
       174
        
                   $out/Applications/Emacs.app/Contents

     

       171
       171
       -
             makeWrapper $emacs/Applications/Emacs.app/Contents/MacOS/Emacs $out/Applications/Emacs.app/Contents/MacOS/Emacs \

     

       172
       172
       -
               --suffix EMACSLOADPATH ":" "$deps/share/emacs/site-lisp:"

     

       175
       175
       +
       

     

       176
       176
       +
             substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \

     

       177
       177
       +
               --subst-var-by bash ${emacs.stdenv.shell} \

     

       178
       178
       +
               --subst-var-by wrapperSiteLisp "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" \

     

       179
       179
       +
               --subst-var prog

     

       180
       180
       +
             chmod +x $out/bin/$progname

     

       173
       181
        
           fi

     

       174
       182
        
       

     

       175
       183
        
           mkdir -p $out/share

+27

pkgs/build-support/emacs/wrapper.sh

···

       1
       1
       +
       #!@bash@

     

       2
       2
       +
       

     

       3
       3
       +
       IFS=:

     

       4
       4
       +
       

     

       5
       5
       +
       newLoadPath=()

     

       6
       6
       +
       added=

     

       7
       7
       +
       

     

       8
       8
       +
       if [[ -n $EMACSLOADPATH ]]

     

       9
       9
       +
       then

     

       10
       10
       +
           while read -rd: entry

     

       11
       11
       +
           do

     

       12
       12
       +
               if [[ -z $entry && -z $added ]]

     

       13
       13
       +
               then

     

       14
       14
       +
                   newLoadPath+=(@wrapperSiteLisp@)

     

       15
       15
       +
                   added=1

     

       16
       16
       +
               fi

     

       17
       17
       +
               newLoadPath+=("$entry")

     

       18
       18
       +
           done <<< "$EMACSLOADPATH:"

     

       19
       19
       +
       else

     

       20
       20
       +
           newLoadPath+=(@wrapperSiteLisp@)

     

       21
       21
       +
           newLoadPath+=("")

     

       22
       22
       +
       fi

     

       23
       23
       +
       

     

       24
       24
       +
       export EMACSLOADPATH="${newLoadPath[*]}"

     

       25
       25
       +
       export emacsWithPackages_siteLisp=@wrapperSiteLisp@

     

       26
       26
       +
       

     

       27
       27
       +
       exec @prog@ "$@"