From ff579039ee1b1d87103caa457fbdcbd14324ac11 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sat, 13 Jan 2024 12:41:56 -0300 Subject: [PATCH] xrdp: reformat the derivation for the changes Signed-off-by: lucasew --- .../networking/remote/xrdp/default.nix | 45 +++++++++++++++++-- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index bf3b8b64f1e7..6c6af3c470b7 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -1,4 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, applyPatches, pkg-config, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: +{ lib +, stdenv +, applyPatches +, fetchFromGitHub +, pkg-config +, which +, perl +, autoconf +, automake +, libtool +, openssl +, systemd +, pam +, fuse +, libjpeg +, libopus +, nasm +, xorg +}: let version = "0.9.23.1"; @@ -45,7 +63,8 @@ let enableParallelBuilding = true; }; - xrdp = stdenv.mkDerivation rec { + + xrdp = stdenv.mkDerivation { inherit version; pname = "xrdp"; @@ -53,7 +72,17 @@ let nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm perl ]; - buildInputs = [ openssl systemd pam fuse libjpeg libopus xorg.libX11 xorg.libXfixes xorg.libXrandr ]; + buildInputs = [ + fuse + libjpeg + libopus + openssl + pam + systemd + xorg.libX11 + xorg.libXfixes + xorg.libXrandr + ]; postPatch = '' substituteInPlace sesman/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q" @@ -64,7 +93,15 @@ let ./bootstrap ''; dontDisableStatic = true; - configureFlags = [ "--with-systemdsystemunitdir=/var/empty" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" "--enable-pam-config=unix" ]; + configureFlags = [ + "--with-systemdsystemunitdir=/var/empty" + "--enable-fuse" + "--enable-ipv6" + "--enable-jpeg" + "--enable-opus" + "--enable-pam-config=unix" + "--enable-rfxcodec" + ]; installFlags = [ "DESTDIR=$(out)" "prefix=" ];