lagrange: 1.17.6 → 1.18.1

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;
   };
 })