diff options
| author | adisbladis <adisbladis@gmail.com> | 2022-10-04 14:23:29 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-04 14:23:29 +1300 |
| commit | 553d58a266284d6bb5a57663def65da3277f4b38 (patch) | |
| tree | a35d905f82e42f1c1f1a9bb0243b756cb3133b9c /pkgs | |
| parent | 78537abc21f9f5dc054ccc004bed6eb0bc13ce4d (diff) | |
| parent | 92e4b65d22e0f47469337e6f7cff58fc3ac4e8fb (diff) | |
Merge pull request #194278 from linj-fork/fix-emacs-native-comp-for-some-packages
elisp-packages: fix AOT native-comp for several packages
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 2bfc2f18e97dd..94ca0cdf0b6d8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -96,7 +96,7 @@ self: let ./build.sh -j$NIX_BUILD_CORES ''; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' ./install.sh --prefix=$out ''; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 39835c58b6501..6190d25ce93d0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -186,7 +186,7 @@ let cd - ''; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' install -m=755 -D source/sqlite/emacsql-sqlite \ $out/share/emacs/site-lisp/elpa/emacsql-sqlite-${old.version}/sqlite/emacsql-sqlite ''; @@ -301,7 +301,7 @@ let make popd ''; - postInstall = '' + postInstall = (attrs.postInstall or "") + "\n" + '' outd=$(echo $out/share/emacs/site-lisp/elpa/libgit-**) mkdir $outd/build install -m444 -t $outd/build ./source/src/libegit2.so @@ -426,7 +426,7 @@ let cd - ''; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' mkdir -p $out/bin install -m755 -Dt $out/bin ./source/server/telega-server ''; @@ -456,7 +456,7 @@ let pkgs.libtool (pkgs.zeromq.override { enableDrafts = true; }) ]; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' mv $EZMQ_LIBDIR/emacs-zmq.* $out/share/emacs/site-lisp/elpa/zmq-* rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile @@ -533,7 +533,7 @@ let ]; # we need the proper out directory to exist, so we do this in the # postInstall instead of postBuild - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' pushd source/build >/dev/null make install -m444 -t $out/share/emacs/site-lisp/elpa/vterm-** ../*.so |