Merge pull request #64265 from risicle/ris-rdesktop-1-8-6

rdesktop: 1.8.3 -> 1.8.6 (security release)
This commit is contained in:
adisbladis 2019-07-03 23:40:28 +01:00 committed by GitHub
commit 6bae45d24f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,18 +1,20 @@
{stdenv, fetchurl, openssl, libX11, libgssglue, pkgconfig {stdenv, fetchFromGitHub, openssl, libX11, libgssglue, pkgconfig, autoreconfHook
, enableCredssp ? (!stdenv.isDarwin) , enableCredssp ? (!stdenv.isDarwin)
} : } :
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
pname = "rdesktop"; pname = "rdesktop";
version = "1.8.3"; version = "1.8.6";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://sourceforge/${pname}/${name}.tar.gz"; owner = pname;
sha256 = "1r7c1rjmw2xzq8fw0scyb453gy9z19774z1z8ldmzzsfndb03cl8"; repo = pname;
rev = "v${version}";
sha256 = "02sbhnqbasa54c75c86qw9w9h9sxxbnldj7bjv2gvn18lmq5rm20";
}; };
nativeBuildInputs = [pkgconfig]; nativeBuildInputs = [pkgconfig autoreconfHook];
buildInputs = [openssl libX11] buildInputs = [openssl libX11]
++ stdenv.lib.optional enableCredssp libgssglue; ++ stdenv.lib.optional enableCredssp libgssglue;