From 0d83270c4693f8c9d0341ccf2943a3e99459dcad Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 3 Nov 2021 14:40:00 +0300 Subject: [PATCH] =?UTF-8?q?lagrange:=201.7.3=20=E2=86=92=201.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/browsers/lagrange/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 6217862eb156..6f218e44847c 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -13,18 +13,19 @@ , pcre , SDL2 , AppKit +, zip , zlib }: stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.7.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-peBdmz/aucrKO5Vsj8WkHkpGpLm4inQHee133Zph3MM="; + sha256 = "sha256-T4LZcdQHqykcv1HnTHMt5LE/1gwKPjN3f0ZmqSCID/A="; fetchSubmodules = true; }; @@ -32,18 +33,13 @@ stdenv.mkDerivation rec { rm -r lib/fribidi lib/harfbuzz ''; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config zip ]; buildInputs = [ fribidi harfbuzz libunistring libwebp mpg123 openssl pcre SDL2 zlib ] ++ lib.optional stdenv.isDarwin AppKit; hardeningDisable = lib.optional (!stdenv.cc.isClang) "format"; - 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