MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xrdp: 0.9.2 -> 0.9.3 (#27742)

Browse source
This commit is contained in:
volth 2017-07-29 15:16:19 +00:00 committed by Joachim F
parent 9d4d62923a
commit fd1b618852
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/applications/networking/remote/xrdp/default.nix
View file

@ -3,13 +3,13 @@
let let
xorgxrdp = stdenv.mkDerivation rec { xorgxrdp = stdenv.mkDerivation rec {
name = "xorgxrdp-${version}"; name = "xorgxrdp-${version}";
version = "0.2.1"; version = "0.2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neutrinolabs"; owner = "neutrinolabs";
repo = "xorgxrdp"; repo = "xorgxrdp";
rev = "v${version}"; rev = "v${version}";
sha256 = "13713qs1v79xa02iw6vaj9b2q62ix770a32z56ql05d6yvfdsfhi"; sha256 = "0l1b38j3q9mxyb8ffpdplbqs6rnabj92i8wngrwlkhfh2c88szn1";
}; };
nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
@ -34,16 +34,15 @@ let
}; };
xrdp = stdenv.mkDerivation rec { xrdp = stdenv.mkDerivation rec {
version = "0.9.2"; version = "0.9.3";
rev = "48c26a3"; # 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 fixed already name = "xrdp-${version}";
name = "xrdp-${version}.${rev}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "volth"; owner = "volth";
repo = "xrdp"; repo = "xrdp";
rev = rev; 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
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "0zs03amshmvy65d26vsv31n9jflkjf43vsjhg4crzifka3vz9p16"; sha256 = "0xqyg3m688fj442zgg9fqmbz7nnzvqpd7a9ki2cwh1hyibacpmz7";
}; };
nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
@ -73,12 +72,12 @@ let
# remove all session types except Xorg (they are not supported by this setup) # remove all session types except Xorg (they are not supported by this setup)
${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini
# remove all session types and then add Xorg # remove all session types and then add Xorg
${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini
cat >> $out/etc/xrdp/sesman.ini <<EOF cat >> $out/etc/xrdp/sesman.ini <<EOF
[Xorg] [Xorg]
param=${xorg.xorgserver}/bin/Xorg param=${xorg.xorgserver}/bin/Xorg
param=-modulepath param=-modulepath