Merge pull request #54062 from volth/patch-298

xrdp: 0.9.7 -> 0.9.9
This commit is contained in:
Danylo Hlynskyi 2019-01-22 01:17:43 +02:00 committed by GitHub
commit bb02d518e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3,13 +3,13 @@
let
xorgxrdp = stdenv.mkDerivation rec {
name = "xorgxrdp-${version}";
version = "0.2.7";
version = "0.2.9";
src = fetchFromGitHub {
owner = "neutrinolabs";
repo = "xorgxrdp";
rev = "v${version}";
sha256 = "15idwgcjgwa9in8y1bblpj67y7w0bfngc2sa0hd9hn0dinrlifrk";
sha256 = "1bhp5x47hajhinvglmc4vxxnpjvfjm6369njb3ghqfr7c5xypvzr";
};
nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
@ -34,15 +34,15 @@ let
};
xrdp = stdenv.mkDerivation rec {
version = "0.9.7";
version = "0.9.9";
name = "xrdp-${version}";
src = fetchFromGitHub {
owner = "volth";
repo = "xrdp";
rev = "refs/heads/runtime-cfg-path-${version}"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be patched already
rev = "refs/tags/runtime-cfg-path-${version}"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be patched already
fetchSubmodules = true;
sha256 = "1dw2zl9zh6win1q0kxj08n9fawpcrs1krjh5978wp0jmq8sdbn7k";
sha256 = "0ynj6pml4f38y8571ryhifza57wfqg4frdrjcwzw3fmryiznfm1z";
};
nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];