From 880ea8a8fe1903973cfff9f6e65526041052366b Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Fri, 7 Oct 2022 02:36:52 +0200
Subject: fix(sterni/emacs): fix build on i686-linux by avoiding CBQN
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 users/sterni/emacs/default.nix | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'users')

diff --git a/users/sterni/emacs/default.nix b/users/sterni/emacs/default.nix
index 212abfc758..67cf71161e 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)
         '';
       })
     ];
-- 
cgit 1.4.1