mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
weston: 5.0.0 -> 6.0.0 (#58522)
https://lists.freedesktop.org/archives/wayland-devel/2019-March/040356.html https://lists.freedesktop.org/archives/wayland-devel/2019-March/040334.html * weston: use freerdp2 not legacy * freerdp_legacy: drop as no longer needed (weston was last user) Co-Authored-By: Michael Weiss <dev.primeos@gmail.com>
This commit is contained in:
parent
310a1ec454
commit
3a26a1fe94
|
@ -1,72 +0,0 @@
|
|||
{ stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, openssl
|
||||
, glib, pcre
|
||||
, printerSupport ? true, cups
|
||||
, pkgconfig
|
||||
, zlib
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXdamage
|
||||
, libXext
|
||||
, alsaLib
|
||||
, ffmpeg
|
||||
, libxkbfile
|
||||
#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt
|
||||
, libXinerama
|
||||
, libXv
|
||||
, pulseaudioSupport ? true
|
||||
}:
|
||||
|
||||
assert printerSupport -> cups != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "freerdp-${version}";
|
||||
version = "1.2.0-beta1+android9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz";
|
||||
sha256 = "181w4lkrk5h5kh2zjlx6h2cl1mfw2aaami3laq3q32pfj06q3rxl";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
cmake
|
||||
openssl
|
||||
glib pcre
|
||||
pkgconfig
|
||||
zlib
|
||||
libX11
|
||||
libXcursor
|
||||
libXdamage
|
||||
libXext
|
||||
alsaLib
|
||||
ffmpeg
|
||||
libxkbfile
|
||||
# xmlto docbook_xml_dtd_412 docbook_xml_xslt
|
||||
libXinerama
|
||||
libXv
|
||||
] ++ stdenv.lib.optional printerSupport cups;
|
||||
|
||||
preConfigure = ''
|
||||
export HOME=$TMP
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-x" "-DWITH_MANPAGES=OFF"
|
||||
] ++ stdenv.lib.optional printerSupport "--with-printer=cups"
|
||||
++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Remote Desktop Protocol Client";
|
||||
|
||||
longDescription = ''
|
||||
FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
|
||||
following the Microsoft Open Specifications.
|
||||
'';
|
||||
|
||||
homepage = http://www.freerdp.com/;
|
||||
license = licenses.free;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -1,47 +1,51 @@
|
|||
{ stdenv, fetchurl, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb
|
||||
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput
|
||||
{ stdenv, fetchurl, meson, ninja, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb
|
||||
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
|
||||
, colord, lcms2
|
||||
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
|
||||
, libwebp ? null, xwayland ? null, wayland-protocols
|
||||
# beware of null defaults, as the parameters *are* supplied by callPackage by default
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "weston-${version}";
|
||||
version = "5.0.0";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
|
||||
sha256 = "1bsc9ry566mpk6fdwkqpvwq2j7m79d9cvh7d3lgf6igsphik98hm";
|
||||
sha256 = "04p6hal5kalmdp5dxwh2h5qhkkb4dvbsk7l091zvvcq70slj6qsl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ meson ninja pkgconfig ];
|
||||
buildInputs = [
|
||||
wayland libGL mesa_noglu libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
|
||||
mtdev libjpeg pam dbus libinput pango libunwind freerdp vaapi libva
|
||||
mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva
|
||||
libwebp wayland-protocols
|
||||
colord lcms2
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-x11-compositor"
|
||||
"--enable-drm-compositor"
|
||||
"--enable-wayland-compositor"
|
||||
"--enable-headless-compositor"
|
||||
"--enable-fbdev-compositor"
|
||||
"--enable-screen-sharing"
|
||||
"--enable-clients"
|
||||
"--enable-weston-launch"
|
||||
"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
|
||||
] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor"
|
||||
++ stdenv.lib.optional (vaapi != null) "--enable-vaapi-recorder"
|
||||
++ stdenv.lib.optionals (xwayland != null) [
|
||||
"--enable-xwayland"
|
||||
"--with-xserver-path=${xwayland.out}/bin/Xwayland"
|
||||
];
|
||||
mesonFlags= [
|
||||
"-Dbackend-drm-screencast-vaapi=${boolToString (vaapi != null)}"
|
||||
"-Dbackend-rdp=${boolToString (freerdp != null)}"
|
||||
"-Dxwayland=${boolToString (xwayland != null)}" # Default is true!
|
||||
"-Dremoting=false" # TODO
|
||||
"-Dimage-webp=${boolToString (libwebp != null)}"
|
||||
"-Dsimple-dmabuf-drm=" # Disables all drivers
|
||||
"-Ddemo-clients=false"
|
||||
"-Dsimple-clients="
|
||||
"-Dtest-junit-xml=false"
|
||||
# TODO:
|
||||
#"--enable-clients"
|
||||
#"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
|
||||
] ++ optionals (xwayland != null) [
|
||||
"-Dxwayland-path=${xwayland.out}/bin/Xwayland"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = {
|
||||
description = "Reference implementation of a Wayland compositor";
|
||||
homepage = https://wayland.freedesktop.org/;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ primeos ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -17994,12 +17994,6 @@ in
|
|||
|
||||
freerdpUnstable = freerdp;
|
||||
|
||||
# This must go when weston v2 is released
|
||||
freerdp_legacy = callPackage ../applications/networking/remote/freerdp/legacy.nix {
|
||||
cmake = cmake_2_8;
|
||||
ffmpeg = ffmpeg_2;
|
||||
};
|
||||
|
||||
fte = callPackage ../applications/editors/fte { };
|
||||
|
||||
game-music-emu = callPackage ../applications/audio/game-music-emu { };
|
||||
|
@ -20725,9 +20719,7 @@ in
|
|||
|
||||
chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {};
|
||||
|
||||
weston = callPackage ../applications/window-managers/weston {
|
||||
freerdp = freerdp_legacy;
|
||||
};
|
||||
weston = callPackage ../applications/window-managers/weston { };
|
||||
|
||||
whitebox-tools = callPackage ../applications/gis/whitebox-tools {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
|
|
Loading…
Reference in a new issue