public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #103913 from catern/copysrc

Browse Source 
emacs: properly include source code when withCsrc is true
This commit is contained in:
Michael Raskin 2020-11-22 16:37:40 +00:00 committed by GitHub
commit eee54dba79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/emacs/generic.nix
View File

@ -145,7 +145,7 @@ in stdenv.mkDerivation {
rm -rf $siteVersionDir rm -rf $siteVersionDir
'' + lib.optionalString withCsrc '' '' + lib.optionalString withCsrc ''
for srcdir in src lisp lwlib ; do for srcdir in src lisp lwlib ; do
dstdir=$siteVersionDir/$srcdir dstdir=$out/share/emacs/$siteVersionDir/$srcdir
mkdir -p $dstdir mkdir -p $dstdir
find $srcdir -name "*.[chm]" -exec cp {} $dstdir \; find $srcdir -name "*.[chm]" -exec cp {} $dstdir \;
cp $srcdir/TAGS $dstdir cp $srcdir/TAGS $dstdir

5
pkgs/applications/editors/emacs/site-start.el
View File

@ -52,9 +52,6 @@ least specific (the system profile)"
(file-name-directory load-file-name)))) ; .../emacs/site-lisp/ (file-name-directory load-file-name)))) ; .../emacs/site-lisp/
(version (version
(file-name-as-directory (file-name-as-directory
(concat emacs-version))
(number-to-string emacs-major-version)
"."
(number-to-string emacs-minor-version))))
(src (file-name-as-directory "src"))) (src (file-name-as-directory "src")))
(setq find-function-C-source-directory (concat emacs version src))) (setq find-function-C-source-directory (concat emacs version src)))