diff options
| author | Volth <volth@webmaster.ms> | 2017-03-31 01:37:06 +0000 |
|---|---|---|
| committer | Volth <volth@webmaster.ms> | 2017-04-29 17:23:35 +0000 |
| commit | 965d0dab7848fb1bf2ee03d9a29afc614a998bfd (patch) | |
| tree | 12e877474bdf886b4248d9ae70372707b7d14e97 | |
| parent | dad760061eebae26c33415a1b38704ff1b1a88d2 (diff) | |
| download | nixlib-965d0dab7848fb1bf2ee03d9a29afc614a998bfd.tar nixlib-965d0dab7848fb1bf2ee03d9a29afc614a998bfd.tar.gz nixlib-965d0dab7848fb1bf2ee03d9a29afc614a998bfd.tar.bz2 nixlib-965d0dab7848fb1bf2ee03d9a29afc614a998bfd.tar.lz nixlib-965d0dab7848fb1bf2ee03d9a29afc614a998bfd.tar.xz nixlib-965d0dab7848fb1bf2ee03d9a29afc614a998bfd.tar.zst nixlib-965d0dab7848fb1bf2ee03d9a29afc614a998bfd.zip | |
xrdp: 0.9.1 -> 0.9.2
| -rw-r--r-- | pkgs/applications/networking/remote/xrdp/default.nix | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index 647e6b6dcb97..8079a0aabe66 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.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "neutrinolabs"; repo = "xorgxrdp"; rev = "v${version}"; - sha256 = "125mv7lm2ns1gdgz6zf647d3pay8if8506rclb3312wwa5qfd2hn"; + sha256 = "13713qs1v79xa02iw6vaj9b2q62ix770a32z56ql05d6yvfdsfhi"; }; nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; @@ -34,8 +34,8 @@ let }; xrdp = stdenv.mkDerivation rec { - version = "0.9.1"; - rev = "0920933"; # 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 + 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}"; src = fetchFromGitHub { @@ -43,7 +43,7 @@ let repo = "xrdp"; rev = rev; fetchSubmodules = true; - sha256 = "0a000h82728vp0abvjk2m03nqqiw2lky7kqk41b70cyd3bp0vdnz"; + sha256 = "0zs03amshmvy65d26vsv31n9jflkjf43vsjhg4crzifka3vz9p16"; }; nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; @@ -52,8 +52,6 @@ let postPatch = '' substituteInPlace sesman/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q" - substituteInPlace common/file_loc.h --replace /etc/xrdp $out/etc/xrdp --replace /usr/local $out - substituteInPlace instfiles/xrdp.sh --replace /etc/xrdp $out/etc/xrdp --replace /usr/local $out ''; preConfigure = '' @@ -66,8 +64,8 @@ let installFlags = [ "DESTDIR=$(out)" "prefix=" ]; postInstall = '' - # remove generated keys as non-determenistic - rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem} + # remove generated keys (as non-determenistic) and upstart script + rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem,xrdp.sh} cp $src/keygen/openssl.conf $out/share/xrdp/openssl.conf @@ -85,9 +83,6 @@ let param=${xorg.xorgserver}/bin/Xorg param=-modulepath param=${xorgxrdp}/lib/xorg/modules,${xorg.xorgserver}/lib/xorg/modules - ; the following two lines are needless after https://github.com/NixOS/nixpkgs/pull/21653 - param=-xkbdir - param=${xorg.xkeyboardconfig}/share/X11/xkb param=-config param=${xorgxrdp}/etc/X11/xrdp/xorg.conf param=-noreset |