summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2021-11-29 23:02:22 +0800
committerGitHub <noreply@github.com>2021-11-29 23:02:22 +0800
commit8a308775674e178495767df90c419425474582a1 (patch)
treefc72404fee2b63238ea24d1f173d7c39c4c3855c
parent228045a35ac8a3951da442875f274d451548b221 (diff)
parent0d83270c4693f8c9d0341ccf2943a3e99459dcad (diff)
downloadnixpkgs-8a308775674e178495767df90c419425474582a1.tar
nixpkgs-8a308775674e178495767df90c419425474582a1.tar.gz
nixpkgs-8a308775674e178495767df90c419425474582a1.tar.bz2
nixpkgs-8a308775674e178495767df90c419425474582a1.tar.lz
nixpkgs-8a308775674e178495767df90c419425474582a1.tar.xz
nixpkgs-8a308775674e178495767df90c419425474582a1.tar.zst
nixpkgs-8a308775674e178495767df90c419425474582a1.zip
Merge pull request #144434 from sikmir/lagrange
lagrange: 1.7.3 → 1.9.0
-rw-r--r--pkgs/applications/networking/browsers/lagrange/default.nix12
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix
index 6217862eb15..6f218e44847 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