From 4a563239aa2f6a3f7adf4704c1407379e8c400e7 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 25 Aug 2024 05:32:35 +0800 Subject: [PATCH] emacsPackages.rime: fix build on darwin https://hydra.nixos.org/build/270409199 --- .../emacs/elisp-packages/melpa-packages.nix | 29 ++++--------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 4eda1d432c5d..8d24a2d8e0cb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -484,29 +484,12 @@ let rime = super.rime.overrideAttrs (old: { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.librime ]; - preBuild = (old.preBuild or "") + - (if pkgs.stdenv.isDarwin then - '' - export MODULE_FILE_SUFFIX=".dylib" - make lib - mkdir -p /tmp/build/rime-lib - cp *.dylib /tmp/build/rime-lib - '' - else - '' - make lib - mkdir -p /build/rime-lib - cp *.so /build/rime-lib - ''); - postInstall = (old.postInstall or "") + - (if pkgs.stdenv.isDarwin then - '' - install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* /tmp/build/rime-lib/*.dylib - '' - else - '' - install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* /build/rime-lib/*.so - ''); + preBuild = (old.preBuild or "") + '' + make lib CC=$CC MODULE_FILE_SUFFIX=${pkgs.stdenv.hostPlatform.extensions.sharedLibrary} + ''; + postInstall = (old.postInstall or "") + '' + install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* librime-emacs.* + ''; }); shm = super.shm.overrideAttrs (attrs: {