chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update patch

Browse source
This commit is contained in:
Charlotte Van Petegem 2023-01-07 17:19:49 +01:00
parent 9f27edbbf6
commit 1b6815b2aa
No known key found for this signature in database
GPG key ID: 019E764B7184435A
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
patches/209509.patch
View file

@ -1,16 +1,16 @@
From 2c5c2248451d8966cb589b2e289ee53325d363c6 Mon Sep 17 00:00:00 2001 From 397d1759f2139a7f4e01b4a2242e1bbf83d0dd9e Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me> From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 7 Jan 2023 15:32:35 +0100 Date: Sat, 7 Jan 2023 15:32:35 +0100
Subject: [PATCH] xrdp: 0.9.9 -> 0.9.21, xorgxrdp: 0.2.9 -> 0.9.19 Subject: [PATCH] xrdp: 0.9.9 -> 0.9.21, xorgxrdp: 0.2.9 -> 0.9.19
--- ---
.../networking/remote/xrdp/default.nix | 40 +-- .../networking/remote/xrdp/default.nix | 42 +--
.../remote/xrdp/dynamic_config.patch | 300 ++++++++++++++++++ .../remote/xrdp/dynamic_config.patch | 300 ++++++++++++++++++
2 files changed, 314 insertions(+), 26 deletions(-) 2 files changed, 315 insertions(+), 27 deletions(-)
create mode 100644 pkgs/applications/networking/remote/xrdp/dynamic_config.patch create mode 100644 pkgs/applications/networking/remote/xrdp/dynamic_config.patch
diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix
index 3744451f3e282..e8ee37503d539 100644 index 3744451f3e282..b7c51d70dfecb 100644
--- a/pkgs/applications/networking/remote/xrdp/default.nix --- a/pkgs/applications/networking/remote/xrdp/default.nix
+++ b/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix
@@ -3,13 +3,13 @@ @@ -3,13 +3,13 @@
@ -68,8 +68,9 @@ index 3744451f3e282..e8ee37503d539 100644
installFlags = [ "DESTDIR=$(out)" "prefix=" ]; installFlags = [ "DESTDIR=$(out)" "prefix=" ];
postInstall = '' postInstall = ''
# remove generated keys (as non-determenistic) and upstart script - # remove generated keys (as non-determenistic) and upstart script
- rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem,xrdp.sh} - rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem,xrdp.sh}
+ # remove generated keys (as non-deterministic)
+ rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem} + rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem}
cp $src/keygen/openssl.conf $out/share/xrdp/openssl.conf cp $src/keygen/openssl.conf $out/share/xrdp/openssl.conf