diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 681de76dda3..1c573eb1a58 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -6,39 +6,45 @@ , pkg-config , fribidi , harfbuzz -, libunistring , libwebp , mpg123 -, openssl -, pcre , SDL2 +, the-foundation , AppKit , zip -, zlib +, enableTUI ? false, ncurses, sealcurses }: stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.12.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-AVitXfHIJmCBBkhg+DLkHeCSoyH6YMaTMaa4REDXEFg="; - fetchSubmodules = true; + sha256 = "sha256-ZCG7i5WmhONockaTt/YCww7N+WvxCX2DIwQIFjAk+K8="; }; - postPatch = '' - rm -r lib/fribidi lib/harfbuzz - ''; - nativeBuildInputs = [ cmake pkg-config zip ]; - buildInputs = [ fribidi harfbuzz libunistring libwebp mpg123 openssl pcre SDL2 zlib ] + buildInputs = [ the-foundation ] + ++ lib.optionals (!enableTUI) [ fribidi harfbuzz libwebp mpg123 SDL2 ] + ++ lib.optionals enableTUI [ ncurses sealcurses ] ++ lib.optional stdenv.isDarwin AppKit; - installPhase = lib.optionalString stdenv.isDarwin '' + 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" + ]; + + installPhase = lib.optionalString (stdenv.isDarwin && !enableTUI) '' mkdir -p $out/Applications mv Lagrange.app $out/Applications ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0c8e5f2e6b..3901e9e1f2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7621,6 +7621,7 @@ with pkgs; lagrange = callPackage ../applications/networking/browsers/lagrange { inherit (darwin.apple_sdk.frameworks) AppKit; }; + lagrange-tui = lagrange.override { enableTUI = true; }; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { };