mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-26 15:44:20 +00:00
4f0dadbf38
After final improvements to the official formatter implementation, this commit now performs the first treewide reformat of Nix files using it. This is part of the implementation of RFC 166. Only "inactive" files are reformatted, meaning only files that aren't being touched by any PR with activity in the past 2 months. This is to avoid conflicts for PRs that might soon be merged. Later we can do a full treewide reformat to get the rest, which should not cause as many conflicts. A CI check has already been running for some time to ensure that new and already-formatted files are formatted, so the files being reformatted here should also stay formatted. This commit was automatically created and can be verified using nix-builda08b3a4d19
.tar.gz \ --argstr baseRevb32a094368
result/bin/apply-formatting $NIXPKGS_PATH
257 lines
5.2 KiB
Nix
257 lines
5.2 KiB
Nix
{
|
|
lib,
|
|
fetchFromGitHub,
|
|
pkg-config,
|
|
runCommand,
|
|
writeText,
|
|
wrapGAppsHook3,
|
|
withNvenc ? false,
|
|
atk,
|
|
cairo,
|
|
cudatoolkit,
|
|
ffmpeg,
|
|
gdk-pixbuf,
|
|
getopt,
|
|
glib,
|
|
gobject-introspection,
|
|
gst_all_1,
|
|
gtk3,
|
|
libappindicator,
|
|
libfakeXinerama,
|
|
librsvg,
|
|
libvpx,
|
|
libwebp,
|
|
lz4,
|
|
nv-codec-headers-10,
|
|
nvidia_x11 ? null,
|
|
pam,
|
|
pandoc,
|
|
pango,
|
|
pulseaudio,
|
|
python3,
|
|
stdenv,
|
|
util-linux,
|
|
which,
|
|
x264,
|
|
x265,
|
|
xauth,
|
|
xdg-utils,
|
|
xorg,
|
|
xorgserver,
|
|
xxHash,
|
|
}:
|
|
|
|
let
|
|
inherit (python3.pkgs) cython buildPythonApplication;
|
|
|
|
xf86videodummy = xorg.xf86videodummy.overrideDerivation (p: {
|
|
patches = [
|
|
# patch provided by Xpra upstream
|
|
./0002-Constant-DPI.patch
|
|
# https://github.com/Xpra-org/xpra/issues/349
|
|
./0003-fix-pointer-limits.patch
|
|
];
|
|
});
|
|
|
|
xorgModulePaths = writeText "module-paths" ''
|
|
Section "Files"
|
|
ModulePath "${xorgserver}/lib/xorg/modules"
|
|
ModulePath "${xorgserver}/lib/xorg/modules/extensions"
|
|
ModulePath "${xorgserver}/lib/xorg/modules/drivers"
|
|
ModulePath "${xf86videodummy}/lib/xorg/modules/drivers"
|
|
EndSection
|
|
'';
|
|
|
|
nvencHeaders =
|
|
runCommand "nvenc-headers"
|
|
{
|
|
inherit nvidia_x11;
|
|
}
|
|
''
|
|
mkdir -p $out/include $out/lib/pkgconfig
|
|
cp ${nv-codec-headers-10}/include/ffnvcodec/nvEncodeAPI.h $out/include
|
|
substituteAll ${./nvenc.pc} $out/lib/pkgconfig/nvenc.pc
|
|
'';
|
|
in
|
|
buildPythonApplication rec {
|
|
pname = "xpra";
|
|
version = "6.2.1";
|
|
|
|
src = fetchFromGitHub {
|
|
owner = "Xpra-org";
|
|
repo = "xpra";
|
|
rev = "v${version}";
|
|
hash = "sha256-TdRQcl0o9L37JXWxoWkAw9sAH5eWpynWkCwo1tBwa9s=";
|
|
};
|
|
|
|
patches = [
|
|
./fix-41106.patch # https://github.com/NixOS/nixpkgs/issues/41106
|
|
./fix-122159.patch # https://github.com/NixOS/nixpkgs/issues/122159
|
|
];
|
|
|
|
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
|
|
substituteInPlace xpra/platform/posix/features.py \
|
|
--replace-fail "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open"
|
|
'';
|
|
|
|
INCLUDE_DIRS = "${pam}/include";
|
|
|
|
nativeBuildInputs = [
|
|
gobject-introspection
|
|
pkg-config
|
|
wrapGAppsHook3
|
|
pandoc
|
|
] ++ lib.optional withNvenc cudatoolkit;
|
|
|
|
buildInputs =
|
|
with xorg;
|
|
[
|
|
libX11
|
|
libXcomposite
|
|
libXdamage
|
|
libXfixes
|
|
libXi
|
|
libxkbfile
|
|
libXrandr
|
|
libXrender
|
|
libXres
|
|
libXtst
|
|
xorgproto
|
|
]
|
|
++ (with gst_all_1; [
|
|
gst-libav
|
|
gst-plugins-bad
|
|
gst-plugins-base
|
|
gst-plugins-good
|
|
gstreamer
|
|
])
|
|
++ [
|
|
atk.out
|
|
cairo
|
|
cython
|
|
ffmpeg
|
|
gdk-pixbuf
|
|
glib
|
|
gtk3
|
|
libappindicator
|
|
librsvg
|
|
libvpx
|
|
libwebp
|
|
lz4
|
|
pam
|
|
pango
|
|
x264
|
|
x265
|
|
xxHash
|
|
]
|
|
++ lib.optional withNvenc nvencHeaders;
|
|
|
|
propagatedBuildInputs =
|
|
with python3.pkgs;
|
|
(
|
|
[
|
|
cryptography
|
|
dbus-python
|
|
gst-python
|
|
idna
|
|
lz4
|
|
netifaces
|
|
numpy
|
|
opencv4
|
|
pam
|
|
paramiko
|
|
pillow
|
|
pycairo
|
|
pycrypto
|
|
pycups
|
|
pygobject3
|
|
pyinotify
|
|
pyopengl
|
|
python-uinput
|
|
pyxdg
|
|
rencode
|
|
invoke
|
|
]
|
|
++ lib.optionals withNvenc [
|
|
pycuda
|
|
pynvml
|
|
]
|
|
);
|
|
|
|
# error: 'import_cairo' defined but not used
|
|
env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-function";
|
|
|
|
setupPyBuildFlags = [
|
|
"--with-Xdummy"
|
|
"--without-Xdummy_wrapper"
|
|
"--without-strict"
|
|
"--with-gtk3"
|
|
# Override these, setup.py checks for headers in /usr/* paths
|
|
"--with-pam"
|
|
"--with-vsock"
|
|
] ++ lib.optional withNvenc "--with-nvenc";
|
|
|
|
dontWrapGApps = true;
|
|
|
|
preFixup =
|
|
''
|
|
makeWrapperArgs+=(
|
|
"''${gappsWrapperArgs[@]}"
|
|
--set XPRA_INSTALL_PREFIX "$out"
|
|
--set XPRA_COMMAND "$out/bin/xpra"
|
|
--set XPRA_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb"
|
|
--set XORG_CONFIG_PREFIX ""
|
|
--prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
|
|
--prefix PATH : ${
|
|
lib.makeBinPath [
|
|
getopt
|
|
xorgserver
|
|
xauth
|
|
which
|
|
util-linux
|
|
pulseaudio
|
|
]
|
|
}
|
|
''
|
|
+ lib.optionalString withNvenc ''
|
|
--prefix LD_LIBRARY_PATH : ${nvidia_x11}/lib
|
|
''
|
|
+ ''
|
|
)
|
|
'';
|
|
|
|
postInstall = ''
|
|
# append module paths to xorg.conf
|
|
cat ${xorgModulePaths} >> $out/etc/xpra/xorg.conf
|
|
cat ${xorgModulePaths} >> $out/etc/xpra/xorg-uinput.conf
|
|
|
|
# make application icon visible to desktop environemnts
|
|
icon_dir="$out/share/icons/hicolor/64x64/apps"
|
|
mkdir -p "$icon_dir"
|
|
ln -sr "$out/share/icons/xpra.png" "$icon_dir"
|
|
'';
|
|
|
|
doCheck = false;
|
|
|
|
enableParallelBuilding = true;
|
|
|
|
passthru = {
|
|
inherit xf86videodummy;
|
|
updateScript = ./update.sh;
|
|
};
|
|
|
|
meta = with lib; {
|
|
homepage = "https://xpra.org/";
|
|
downloadPage = "https://xpra.org/src/";
|
|
description = "Persistent remote applications for X";
|
|
changelog = "https://github.com/Xpra-org/xpra/releases/tag/v${version}";
|
|
platforms = platforms.linux;
|
|
license = licenses.gpl2Only;
|
|
maintainers = with maintainers; [
|
|
offline
|
|
numinit
|
|
mvnetbiz
|
|
];
|
|
};
|
|
}
|