diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2020-11-22 16:37:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-22 16:37:40 +0000 |
| commit | eee54dba7957df080044e7164243d2fba9e3dda3 (patch) | |
| tree | b6b1888c3225e8c18b6bbdc77feaafd0efd4650e /pkgs/applications/editors | |
| parent | 5c4a2158cb63b4a1a00af6a9cbd56ef0fd1ea2f2 (diff) | |
| parent | 802fa5b9d1b166568243a514a64bb9fc78ceb60d (diff) | |
Merge pull request #103913 from catern/copysrc
emacs: properly include source code when withCsrc is true
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/emacs/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs/site-start.el | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 2de45d03dd6a8..a0bd1193d2cda 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -145,7 +145,7 @@ in stdenv.mkDerivation { rm -rf $siteVersionDir '' + lib.optionalString withCsrc '' for srcdir in src lisp lwlib ; do - dstdir=$siteVersionDir/$srcdir + dstdir=$out/share/emacs/$siteVersionDir/$srcdir mkdir -p $dstdir find $srcdir -name "*.[chm]" -exec cp {} $dstdir \; cp $srcdir/TAGS $dstdir diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index de4708b889089..2f02d6d1a86d0 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -52,9 +52,6 @@ least specific (the system profile)" (file-name-directory load-file-name)))) ; .../emacs/site-lisp/ (version (file-name-as-directory - (concat - (number-to-string emacs-major-version) - "." - (number-to-string emacs-minor-version)))) + emacs-version)) (src (file-name-as-directory "src"))) (setq find-function-C-source-directory (concat emacs version src))) |