From 780a49292920669e4afff1a029e23b8d3bc205c8 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 21 Sep 2024 15:12:10 +0400
Subject: [PATCH 1/2] =?UTF-8?q?the-foundation:=201.8.1=20=E2=86=92=201.9.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/the-foundation/default.nix      | 50 ++++++++++++-------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/development/libraries/the-foundation/default.nix
index d3021995ff8f..bebfd35327d9 100644
--- a/pkgs/development/libraries/the-foundation/default.nix
+++ b/pkgs/development/libraries/the-foundation/default.nix
@@ -1,41 +1,55 @@
-{ lib
-, stdenv
-, fetchFromGitea
-, cmake
-, pkg-config
-, curl
-, libunistring
-, openssl
-, pcre
-, zlib
+{
+  lib,
+  stdenv,
+  fetchFromGitea,
+  cmake,
+  pkg-config,
+  curl,
+  libunistring,
+  openssl,
+  pcre,
+  zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "the-foundation";
-  version = "1.8.1";
+  version = "1.9.0";
 
   src = fetchFromGitea {
     domain = "git.skyjake.fi";
     owner = "skyjake";
     repo = "the_Foundation";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-gyDBK/bF+QxXMnthUfMjeUuRBZk0Xcahm7wOtLGs5kY=";
+    hash = "sha256-hrwnY8m4xW8Sr2RunwD5VB+gnYUtZxXyGoiO3N23qGM=";
   };
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
 
-  buildInputs = [ curl libunistring openssl pcre zlib ];
+  buildInputs = [
+    curl
+    libunistring
+    openssl
+    pcre
+    zlib
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "UNISTRING_DIR" "${libunistring}")
+  ];
 
   postFixup = ''
     substituteInPlace "$out"/lib/pkgconfig/the_Foundation.pc \
       --replace '="''${prefix}//' '="/'
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Opinionated C11 library for low-level functionality";
     homepage = "https://git.skyjake.fi/skyjake/the_Foundation";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.unix;
   };
 })

From cc72c8cfd694b4f6f814dd5cafb8ca36a55cafff Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 21 Sep 2024 15:38:29 +0400
Subject: [PATCH 2/2] =?UTF-8?q?lagrange:=201.17.6=20=E2=86=92=201.18.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networking/browsers/lagrange/default.nix  | 104 +++++++++++-------
 1 file changed, 63 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix
index d6770a85138e..232677f9ffab 100644
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -1,63 +1,85 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, nix-update-script
-, cmake
-, pkg-config
-, fribidi
-, harfbuzz
-, libwebp
-, mpg123
-, SDL2
-, the-foundation
-, AppKit
-, zip
-, enableTUI ? false, ncurses, sealcurses
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  nix-update-script,
+  cmake,
+  pkg-config,
+  fribidi,
+  harfbuzz,
+  libogg,
+  libwebp,
+  mpg123,
+  opusfile,
+  SDL2,
+  the-foundation,
+  AppKit,
+  zip,
+  enableTUI ? false,
+  ncurses,
+  sealcurses,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lagrange";
-  version = "1.17.6";
+  version = "1.18.1";
 
   src = fetchFromGitHub {
     owner = "skyjake";
     repo = "lagrange";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZF2HMfEI0LpvJrnB9MN8sQQDyBl/mRsI7pt6lfN4wdU=";
+    hash = "sha256-iIUWF93RZheW4uf3zgs1jqDjQnn0nFH7GOMaLBR0w0o=";
   };
 
-  nativeBuildInputs = [ cmake pkg-config zip ];
-
-  buildInputs = [ the-foundation ]
-    ++ lib.optionals (!enableTUI) [ fribidi harfbuzz libwebp mpg123 SDL2 ]
-    ++ lib.optionals enableTUI [ ncurses sealcurses ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin AppKit;
-
-  cmakeFlags = lib.optionals enableTUI [
-    "-DENABLE_TUI=YES"
-    "-DENABLE_MPG123=NO"
-    "-DENABLE_WEBP=NO"
-    "-DENABLE_FRIBIDI=NO"
-    "-DENABLE_HARFBUZZ=NO"
-    "-DENABLE_POPUP_MENUS=NO"
-    "-DENABLE_IDLE_SLEEP=NO"
-    "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share"
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    zip
   ];
 
-  installPhase = lib.optionalString (stdenv.hostPlatform.isDarwin && !enableTUI) ''
-    mkdir -p $out/Applications
-    mv Lagrange.app $out/Applications
-  '';
+  buildInputs =
+    [
+      the-foundation
+      fribidi
+      harfbuzz
+      libogg
+      libwebp
+      mpg123
+      opusfile
+      SDL2
+    ]
+    ++ lib.optionals enableTUI [
+      ncurses
+      sealcurses
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin AppKit;
+
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_TUI" enableTUI)
+    (lib.cmakeFeature "CMAKE_INSTALL_DATAROOTDIR" "${placeholder "out"}/share")
+  ];
+
+  installPhase =
+    lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $out/Applications
+      mv Lagrange.app $out/Applications
+    ''
+    + lib.optionalString (stdenv.hostPlatform.isDarwin && enableTUI) ''
+      # https://github.com/skyjake/lagrange/issues/610
+      make install
+      install -d $out/share/lagrange
+      ln -s $out/Applications/Lagrange.app/Contents/Resources/resources.lgr $out/share/lagrange/resources.lgr
+    '';
 
   passthru = {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Beautiful Gemini Client";
     homepage = "https://gmi.skyjake.fi/lagrange/";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.unix;
   };
 })