diff options
| author | volth <volth@webmaster.ms> | 2017-07-29 15:16:19 +0000 |
|---|---|---|
| committer | Joachim F <joachifm@users.noreply.github.com> | 2017-07-29 16:16:19 +0100 |
| commit | fd1b6188528fcc67e0fee416b2dd94c51f1ef379 (patch) | |
| tree | 3cf95b8f7521542de094af74a5ad760fb8f0fc7e /pkgs/applications/networking/remote | |
| parent | 9d4d62923ae10de107a4e0693aa859c80710bb7b (diff) | |
| download | nixlib-fd1b6188528fcc67e0fee416b2dd94c51f1ef379.tar nixlib-fd1b6188528fcc67e0fee416b2dd94c51f1ef379.tar.gz nixlib-fd1b6188528fcc67e0fee416b2dd94c51f1ef379.tar.bz2 nixlib-fd1b6188528fcc67e0fee416b2dd94c51f1ef379.tar.lz nixlib-fd1b6188528fcc67e0fee416b2dd94c51f1ef379.tar.xz nixlib-fd1b6188528fcc67e0fee416b2dd94c51f1ef379.tar.zst nixlib-fd1b6188528fcc67e0fee416b2dd94c51f1ef379.zip | |
xrdp: 0.9.2 -> 0.9.3 (#27742)
Diffstat (limited to 'pkgs/applications/networking/remote')
| -rw-r--r-- | pkgs/applications/networking/remote/xrdp/default.nix | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index 8079a0aabe66..eff81e998579 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -3,13 +3,13 @@ let xorgxrdp = stdenv.mkDerivation rec { name = "xorgxrdp-${version}"; - version = "0.2.1"; - + version = "0.2.3"; + src = fetchFromGitHub { owner = "neutrinolabs"; repo = "xorgxrdp"; rev = "v${version}"; - sha256 = "13713qs1v79xa02iw6vaj9b2q62ix770a32z56ql05d6yvfdsfhi"; + sha256 = "0l1b38j3q9mxyb8ffpdplbqs6rnabj92i8wngrwlkhfh2c88szn1"; }; nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; @@ -34,16 +34,15 @@ let }; xrdp = stdenv.mkDerivation rec { - version = "0.9.2"; - 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}.${rev}"; - + version = "0.9.3"; + name = "xrdp-${version}"; + src = fetchFromGitHub { owner = "volth"; 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; - sha256 = "0zs03amshmvy65d26vsv31n9jflkjf43vsjhg4crzifka3vz9p16"; + sha256 = "0xqyg3m688fj442zgg9fqmbz7nnzvqpd7a9ki2cwh1hyibacpmz7"; }; 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) ${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 ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini - + cat >> $out/etc/xrdp/sesman.ini <<EOF - + [Xorg] param=${xorg.xorgserver}/bin/Xorg param=-modulepath |