.

2 files changed, 40 insertions, 6 deletions

diff --git a/applications/cli/gemini/bollux/default.nix b/applications/cli/gemini/bollux/default.nix
index 175fe80..c869c48 100644
--- a/applications/cli/gemini/bollux/default.nix
+++ b/applications/cli/gemini/bollux/default.nix
@@ -3,23 +3,42 @@ let
   bollux =
     pkgs.stdenvNoCC.mkDerivation rec {
       pname = "bollux";
-      version = "f472e60f1164f0dc025d06db2a13ff4e8ebee1a2";
+      version = "0.4.1";
+      nativeBuildInputs = [ pkgs.makeWrapper ];
+      buildInputs = [ pkgs.bashInteractive ];
+      dontBuild = true;
+      makeFlags = [ "PREFIX=$(out)" ];
+
       src = pkgs.fetchFromGitea {
         domain = "tildegit.org";
         owner = "acdw";
         repo = "bollux";
-        rev = version;
+        rev = "f472e60f1164f0dc025d06db2a13ff4e8ebee1a2";
         hash = "sha256-mo2qWCPfW+dUaYcJLsos/vR5nJ8n1eABy8Zy8OZsfVg=";
       };
-      installPhase = ''
-        mkdir -p $out/bin
-        make install PREFIX=$out
+
+      runtimeDependencies = [
+        pkgs.bashInteractive
+        pkgs.iconv
+        pkgs.openssl
+        pkgs.less
+        pkgs.coreutils
+      ];
+
+      patches = [
+        # https://tildegit.org/acdw/bollux/issues/13#issuecomment-9786
+        ./fix_lesskey_nag.patch
+      ];
+
+      postInstall = ''
+        wrapProgram $out/bin/bollux --prefix PATH : ${lib.makeBinPath runtimeDependencies}
       '';
+
       meta = with lib; {
         description = "a Gemini browser in like, idk, 96% pure Bash";
         homepage = "https://tildegit.org/acdw/bollux";
         license = licenses.mit;
-        platforms = platforms.unix;
+        platforms = platforms.all;
         mainProgram = "bollux";
       };
     };
@@ -33,4 +52,6 @@ in
     # })
     bollux
   ];
+
+  xdg.configFile."bollux/bollux.conf".text = '''';
 }
diff --git a/applications/cli/gemini/bollux/fix_lesskey_nag.patch b/applications/cli/gemini/bollux/fix_lesskey_nag.patch
new file mode 100644
index 0000000..329b886
--- /dev/null
+++ b/applications/cli/gemini/bollux/fix_lesskey_nag.patch
@@ -0,0 +1,13 @@
+diff --git i/bollux w/bollux
+index 267418e..090217e 100755
+--- i/bollux
++++ w/bollux
+@@ -1130,7 +1130,7 @@ display() { # display METADATA [TITLE]
+ 		# text, and pre-formatted text shouldn't wrap.
+ 		less_cmd+=(-S)
+ 		# Load the keybindings (see `lesskey').
+-		mklesskey && less_cmd+=(-k "$BOLLUX_LESSKEY")
++		mklesskey && less_cmd+=(--lesskey-src="$BOLLUX_LESSKEY")
+ 		local helpline="${KEY_OPEN}:open, "
+ 		helpline+="${KEY_GOTO}/"
+ 		helpline+="${KEY_GOTO_FROM}:goto, "