forked from mirrors/nixpkgs
emacs: fix siteVersionDir path
siteVersionDir isn't a full path, it's just the name of the version directory entry in $out/share/emacs, e.g. "27.1", so sinced1b0eef9b5
("emacs: Don't use interpolation for version"), we've been trying to remove a non-existent directory. This would have been caught if we hadn't been giving -f to rm unnecessarily, because -f suppresses errors. As well as fixing the path, I've removed the -f from rm. Doing this to the line above as well revealed that rm-ing $out/var was no longer necessary, since nothing has been put there sinceac23a7c459
("emacs: 25.3 → 26.1") -- it would now only be created if we set the --with-gameuser configure option, which we don't.
This commit is contained in:
parent
de8b28918c
commit
755670f5e4
|
@ -141,8 +141,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
siteVersionDir=`ls $out/share/emacs | grep -v site-lisp | head -n 1`
|
||||
|
||||
rm -rf $out/var
|
||||
rm -rf $siteVersionDir
|
||||
rm -r $out/share/emacs/$siteVersionDir/site-lisp
|
||||
'' + lib.optionalString withCsrc ''
|
||||
for srcdir in src lisp lwlib ; do
|
||||
dstdir=$out/share/emacs/$siteVersionDir/$srcdir
|
||||
|
|
Loading…
Reference in a new issue