Unverified Commit c1973d87 authored by Lin Jian's avatar Lin Jian Committed by GitHub
Browse files

Merge pull request #337130 from linj-fork/pr/fix-emacs-rime-darwin

emacsPackages.rime: fix build on darwin
parents 981c5658 4a563239
Loading
Loading
Loading
Loading
+6 −23
Original line number Diff line number Diff line
@@ -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: {