diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 20:09:45 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 20:09:45 +0100 |
| commit | c5881ec2c91da7bcb4b0299f5842019c70cb90f5 (patch) | |
| tree | 9efaa7fe9f326a04e98760f5b3f10f6f463905ce /pkgs/applications/networking | |
| parent | e6834171b930f6db3796a16785d7cbb3173541b1 (diff) | |
| parent | 095544187a8ed13f14356f5df7dbe0ecc059ceb5 (diff) | |
| download | nixlib-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar nixlib-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.gz nixlib-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.bz2 nixlib-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.lz nixlib-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.xz nixlib-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.zst nixlib-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/p2p/tixati/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/remote/ssvnc/default.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 9f47f8464a13..13d44655df84 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tixati-${version}"; - version = "2.57"; + version = "2.58"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "0z6znh62ry4fmc6c54zq79pk1b5bwkz93bxsfgvxpf6sajpyf9n7"; + sha256 = "077z5i0grkxkgw2npylv4r897434k2pr03brqx5hjpjw3797r141"; }; installPhase = '' diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix index f20bb740615c..99835627f879 100644 --- a/pkgs/applications/networking/remote/ssvnc/default.nix +++ b/pkgs/applications/networking/remote/ssvnc/default.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ imake zlib jdk libX11 libXt libXmu libXaw libXext libXpm openjpeg openssl ]; - configurePhase = "makeFlags=PREFIX=$out"; + dontUseImakeConfigure = true; + + makeFlags = "PREFIX=$(out)"; hardeningDisable = [ "format" ]; |