summary refs log tree commit diff
path: root/pkgs/tools/networking/eternal-terminal
diff options
context:
space:
mode:
authorMarc Seeger <mseeger@fb.com>2021-04-26 16:38:00 -0700
committerMarc Seeger <mseeger@fb.com>2021-04-28 05:48:42 -0700
commit715f47fe0641f1232b9d1dbaf381928f7eaef692 (patch)
treefac239a72280b7c5bc60632c9c11e61307fe2d4d /pkgs/tools/networking/eternal-terminal
parent7fe184a14a4ad4f0594c9b5ca8c7d0ac7c351296 (diff)
downloadnixpkgs-715f47fe0641f1232b9d1dbaf381928f7eaef692.tar
nixpkgs-715f47fe0641f1232b9d1dbaf381928f7eaef692.tar.gz
nixpkgs-715f47fe0641f1232b9d1dbaf381928f7eaef692.tar.bz2
nixpkgs-715f47fe0641f1232b9d1dbaf381928f7eaef692.tar.lz
nixpkgs-715f47fe0641f1232b9d1dbaf381928f7eaef692.tar.xz
nixpkgs-715f47fe0641f1232b9d1dbaf381928f7eaef692.tar.zst
nixpkgs-715f47fe0641f1232b9d1dbaf381928f7eaef692.zip
eternal-terminal: 6.0.13 -> 6.1.7
Diffstat (limited to 'pkgs/tools/networking/eternal-terminal')
-rw-r--r--pkgs/tools/networking/eternal-terminal/default.nix19
1 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index 78884a23cbb..01dbc32eb8d 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -3,27 +3,38 @@
 , cmake
 , gflags
 , libsodium
+, openssl
 , protobuf
+, zlib
 }:
 
 stdenv.mkDerivation rec {
   pname = "eternal-terminal";
-  version = "6.0.13";
+  version = "6.1.7";
 
   src = fetchFromGitHub {
     owner = "MisterTea";
     repo = "EternalTerminal";
     rev = "et-v${version}";
-    sha256 = "0sb1hypg2276y8c2a5vivrkcxp70swddvhnd9h273if3kv6j879r";
+    sha256 = "0jpm1ilr1qfz55y4mqp75v4q433qla5jhi1b8nsmx48srs7f0j2q";
   };
 
+  cmakeFlags= [
+    "-DDISABLE_VCPKG=TRUE"
+    "-DDISABLE_SENTRY=TRUE"
+    "-DDISABLE_CRASH_LOG=TRUE"
+  ];
+
+  CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++17";
+  LDFLAGS = lib.optional stdenv.cc.isClang "-lc++fs";
+
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ gflags libsodium protobuf ];
+  buildInputs = [ gflags openssl zlib libsodium protobuf ];
 
   meta = with lib; {
     description = "Remote shell that automatically reconnects without interrupting the session";
     license = licenses.asl20;
-    homepage = "https://mistertea.github.io/EternalTerminal/";
+    homepage = "https://eternalterminal.dev/";
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ dezgeg pingiun ];
   };