From f8634b5d952787f395def53353c51a01329e80f3 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 30 Jul 2021 00:38:27 +0300 Subject: [PATCH] =?UTF-8?q?lagrange:=201.5.2=20=E2=86=92=201.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/browsers/lagrange/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index f15cf6c81b4..9f3a27e22b5 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -4,6 +4,8 @@ , nix-update-script , cmake , pkg-config +, fribidi +, harfbuzz , libunistring , mpg123 , openssl @@ -15,27 +17,36 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.5.2"; + version = "1.6.2"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-NjiTjY2YuxUs/Wny7aDqHGw/2ML1fenjHrl089rLXFI="; + sha256 = "sha256-YTWVBQt0X12UDFJv/rPBqlIBC4iXSvpdYi/HIl+BPxc="; fetchSubmodules = true; }; + postPatch = '' + rm -r lib/fribidi lib/harfbuzz + ''; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libunistring mpg123 openssl pcre SDL2 zlib ] + buildInputs = [ fribidi harfbuzz libunistring mpg123 openssl pcre SDL2 zlib ] ++ lib.optional stdenv.isDarwin AppKit; hardeningDisable = lib.optional (!stdenv.cc.isClang) "format"; - installPhase = if stdenv.isDarwin then '' + cmakeFlags = [ + "-DENABLE_HARFBUZZ_MINIMAL:BOOL=OFF" + "-DENABLE_FRIBIDI_BUILD:BOOL=OFF" + ]; + + installPhase = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv Lagrange.app $out/Applications - '' else null; + ''; passthru = { updateScript = nix-update-script {