diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-20 09:40:09 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-20 09:40:09 +0200 |
| commit | ca6ee8f519733e1f45b7598d995245dd687f535c (patch) | |
| tree | 3c84d14a7da3b890b5f3be62ab13e6eae2805695 /pkgs/tools/networking | |
| parent | 4c774f24acf2b674b99f70690f73a67c095f1968 (diff) | |
| parent | ceb0ce849fe01fcbc221e3b978a0744bf3735752 (diff) | |
| download | nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.gz nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.bz2 nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.lz nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.xz nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.zst nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/curl/7_59.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/networking/eternal-terminal/default.nix | 12 |
3 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/tools/networking/curl/7_59.nix b/pkgs/tools/networking/curl/7_59.nix index 0482bcf52629..508b357e3fde 100644 --- a/pkgs/tools/networking/curl/7_59.nix +++ b/pkgs/tools/networking/curl/7_59.nix @@ -77,7 +77,11 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}" # For the 'urandom', maybe it should be a cross-system option ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "--with-random=/dev/urandom"; + "--with-random=/dev/urandom" + ++ stdenv.lib.optionals stdenv.hostPlatform.isWindows [ + "--disable-shared" + "--enable-static" + ]; CXX = "${stdenv.cc.targetPrefix}c++"; CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index dda97d34d869..4af8ff75e210 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -81,7 +81,11 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}" # For the 'urandom', maybe it should be a cross-system option ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "--with-random=/dev/urandom"; + "--with-random=/dev/urandom" + ++ stdenv.lib.optionals stdenv.hostPlatform.isWindows [ + "--disable-shared" + "--enable-static" + ]; CXX = "${stdenv.cc.targetPrefix}c++"; CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 8941494e316e..fda5d25aa17d 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, gflags, glog, libsodium, protobuf }: +{ stdenv, fetchFromGitHub, cmake, ninja, gflags, libsodium, protobuf }: stdenv.mkDerivation rec { name = "eternal-terminal-${version}"; - version = "4.1.2"; + version = "5.1.6"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTCP"; rev = "refs/tags/et-v${version}"; - sha256 = "1zy30ccsddgs2wqwxphnx5i00j4gf69lr68mzg9x6imqfz0sbcjz"; + sha256 = "0df573c5hi3hxa0d3m02zf2iyh841540dklj9lmp6faik8cp39jz"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ gflags glog libsodium protobuf ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ gflags libsodium protobuf ]; meta = with stdenv.lib; { description = "Remote shell that automatically reconnects without interrupting the session"; |