From d1b0eef9b51361b2443b041938541cf7cd348e8a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Jul 2020 10:55:31 +0200 Subject: emacs: Don't use interpolation for version --- pkgs/applications/editors/emacs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index bb2b9f4622b2..83ac606b2311 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -135,11 +135,13 @@ stdenv.mkDerivation rec { $out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el + siteVersionDir=`ls $out/share/emacs | grep -v site-lisp | head -n 1` + rm -rf $out/var - rm -rf $out/share/emacs/${version}/site-lisp + rm -rf $siteVersionDir '' + lib.optionalString withCsrc '' for srcdir in src lisp lwlib ; do - dstdir=$out/share/emacs/${version}/$srcdir + dstdir=$siteVersionDir/$srcdir mkdir -p $dstdir find $srcdir -name "*.[chm]" -exec cp {} $dstdir \; cp $srcdir/TAGS $dstdir -- cgit v1.2.3