diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-30 17:46:21 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-30 17:46:21 +0100 |
| commit | 1828a5c5ba465b7f342568c6a245a042831ef54c (patch) | |
| tree | 3052eb1b293c7655d9ea58d78aa81d0bf2c1d539 /pkgs/applications/networking | |
| parent | 70f5d64cb359a8e4351a32f24d68b8a8e0227b76 (diff) | |
| parent | 74e283403c9f10504c1d2ab8c4970289c81a482b (diff) | |
| download | nixlib-1828a5c5ba465b7f342568c6a245a042831ef54c.tar nixlib-1828a5c5ba465b7f342568c6a245a042831ef54c.tar.gz nixlib-1828a5c5ba465b7f342568c6a245a042831ef54c.tar.bz2 nixlib-1828a5c5ba465b7f342568c6a245a042831ef54c.tar.lz nixlib-1828a5c5ba465b7f342568c6a245a042831ef54c.tar.xz nixlib-1828a5c5ba465b7f342568c6a245a042831ef54c.tar.zst nixlib-1828a5c5ba465b7f342568c6a245a042831ef54c.zip | |
Merge master into staging-next
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" ]; |