diff options
author | sterni <sternenseemann@systemli.org> | 2022-10-07T00·36+0200 |
---|---|---|
committer | sterni <sternenseemann@systemli.org> | 2022-10-07T00·51+0000 |
commit | 880ea8a8fe1903973cfff9f6e65526041052366b (patch) | |
tree | 6ae30b8d8f69e7aca2a09b72198814badb8546ee /users/sterni | |
parent | 059dea0e3286ffc7d4d87e0a9960f879efb52428 (diff) |
fix(sterni/emacs): fix build on i686-linux by avoiding CBQN r/5047
Skip setting bqn-interpreter-path on 32bit – contrary to the LanguageTool integration, bqn-mode is still useful without the binary which doesn't compile on i686-linux. Change-Id: If4493e3e72307ca14984c660f376952cbdcc201c Reviewed-on: https://cl.tvl.fyi/c/depot/+/6887 Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
Diffstat (limited to 'users/sterni')
-rw-r--r-- | users/sterni/emacs/default.nix | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/users/sterni/emacs/default.nix b/users/sterni/emacs/default.nix index 212abfc75854..67cf71161e10 100644 --- a/users/sterni/emacs/default.nix +++ b/users/sterni/emacs/default.nix @@ -54,27 +54,27 @@ let (pkgs.writeTextFile { name = "injected-emacs.d"; destination = "/nix-inject.el"; - text = '' - ;; bqn-mode - (setq bqn-interpreter-path "${pkgs.cbqn}/bin/BQN") - '' - # Java doesn't seem to be available for non 64bit platforms in nixpkgs - + lib.optionalString is64bit '' + text = + # Java doesn't seem to be available for non 64bit platforms in nixpkgs + # CBQN doesn't seem to support i686 at least + lib.optionalString is64bit '' + ;; bqn-mode + (setq bqn-interpreter-path "${pkgs.cbqn}/bin/BQN") - ;; languagetool - (setq languagetool-java-bin "${pkgs.jre}/bin/java" - languagetool-console-command "${pkgs.languagetool}/share/languagetool-commandline.jar" - languagetool-server-command "${pkgs.languagetool}/share/languagetool-server.jar") + ;; languagetool + (setq languagetool-java-bin "${pkgs.jre}/bin/java" + languagetool-console-command "${pkgs.languagetool}/share/languagetool-commandline.jar" + languagetool-server-command "${pkgs.languagetool}/share/languagetool-server.jar") '' + '' - ;; use bash instead of fish from SHELL for some things, as it plays - ;; nicer with TERM=dumb, as I don't need/want vterm anyways. - ;; We want it to source /etc/profile for some extra setup that - ;; kicks in if TERM=dumb, meaning we can't use dash/sh mode. - (setq shell-file-name "${pkgs.bash}/bin/bash" - explicit-bash-args '("-l")) + ;; use bash instead of fish from SHELL for some things, as it plays + ;; nicer with TERM=dumb, as I don't need/want vterm anyways. + ;; We want it to source /etc/profile for some extra setup that + ;; kicks in if TERM=dumb, meaning we can't use dash/sh mode. + (setq shell-file-name "${pkgs.bash}/bin/bash" + explicit-bash-args '("-l")) - (provide 'nix-inject) + (provide 'nix-inject) ''; }) ]; |