From 0ffc09a73eff3a3c725c77e6223fceed288fbd07 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 16 Jul 2024 10:53:28 +0800 Subject: [PATCH] emacs.pkgs.llvm-mode: replace trivialBuild with melpaBuild Related: https://github.com/NixOS/nixpkgs/issues/278925 There are three major modes inside this package. Ideally, we should split it into three packages. However, to keep backward compatibility, it is not split. --- .../manual-packages/llvm-mode/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix index 02fec5ef7f72..4938f2d98be1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix @@ -1,14 +1,10 @@ -{ trivialBuild -, llvmPackages -}: +{ melpaBuild, llvmPackages }: -trivialBuild { +melpaBuild { pname = "llvm-mode"; - inherit (llvmPackages.llvm) src version; + inherit (llvmPackages.llvm) version; - postUnpack = '' - sourceRoot="$sourceRoot/llvm/utils/emacs" - ''; + src = "${llvmPackages.llvm.src}/llvm/utils/emacs"; meta = { inherit (llvmPackages.llvm.meta) homepage license;