Merge master into staging-next

This commit is contained in:
github-actions[bot] 2020-12-19 06:19:44 +00:00 committed by GitHub
commit a0572e9aae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 198 additions and 2 deletions

View file

@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "syncplay";
version = "1.6.6";
version = "1.6.7";
format = "other";
@ -10,7 +10,7 @@ buildPythonApplication rec {
owner = "Syncplay";
repo = "syncplay";
rev = "v${version}";
sha256 = "1wkxdp7dv5y1100awy949higvs5035ylfyl83qrp4lnimy3imw09";
sha256 = "1hxmd13sff51lh9l3vpk33qrzf7gi58c76bc01iqimp17sxwfz3k";
};
propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls;

View file

@ -0,0 +1,23 @@
{ newScope, wayfirePlugins }:
let
self = with self; {
inherit wayfirePlugins;
callPackage = newScope self;
wayfire = callPackage ./. { };
wcm = callPackage ./wcm.nix {
inherit (wayfirePlugins) wf-shell;
};
wrapWayfireApplication = callPackage ./wrapper.nix { };
withPlugins = selector: self // {
wayfire = wrapWayfireApplication wayfire selector;
wcm = wrapWayfireApplication wcm selector;
};
};
in
self

View file

@ -0,0 +1,30 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, git
, cairo, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland
, wayland-protocols, wf-config, wlroots
}:
stdenv.mkDerivation rec {
pname = "wayfire";
version = "0.6.0";
src = fetchurl {
url = "https://github.com/WayfireWM/wayfire/releases/download/${version}/wayfire-${version}.tar.xz";
sha256 = "0wc5szslgf8d4r4dlbfgc5v49j2ziaa8fycmknq4p0vl67mh7acq";
};
nativeBuildInputs = [ meson ninja pkg-config wayland ];
buildInputs = [
cairo libdrm libexecinfo libinput libjpeg libxkbcommon wayland
wayland-protocols wf-config wlroots
];
mesonFlags = [ "--sysconfdir" "/etc" ];
meta = with lib; {
homepage = "https://wayfire.org/";
description = "3D wayland compositor";
license = licenses.mit;
maintainers = with maintainers; [ qyliss wucke13 ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,12 @@
{ newScope, wayfire }:
let
self = with self; {
inherit wayfire;
callPackage = newScope self;
wf-shell = callPackage ./wf-shell.nix { };
};
in
self

View file

@ -0,0 +1,29 @@
{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, wayland, wrapGAppsHook
, gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell
}:
stdenv.mkDerivation rec {
pname = "wcm";
version = "0.6.0";
src = fetchFromGitHub {
owner = "WayfireWM";
repo = "wcm";
rev = "v${version}";
sha256 = "1b22gymqfn0c49nf39676q5bj25rxab874iayiq31cmn14r30dyg";
};
nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ];
buildInputs = [
gnome3.gtk libevdev libxml2 wayfire wayland
wayland-protocols wf-config wf-shell
];
meta = with lib; {
homepage = "https://github.com/WayfireWM/wcm";
description = "Wayfire Config Manager";
license = licenses.mit;
maintainers = with maintainers; [ qyliss wucke13 ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,23 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, glm, libevdev, libxml2 }:
stdenv.mkDerivation rec {
pname = "wf-config";
version = "0.6.0";
src = fetchurl {
url = "https://github.com/WayfireWM/wf-config/releases/download/${version}/wf-config-${version}.tar.xz";
sha256 = "1a5aqybhbp9dp4jygrm3gbkdap5qbd52y6ihfr4rm1cj37sckcn0";
};
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ libevdev libxml2 ];
propagatedBuildInputs = [ glm ];
meta = with lib; {
homepage = "https://github.com/WayfireWM/wf-config";
description = "Library for managing configuration files, written for Wayfire";
license = licenses.mit;
maintainers = with maintainers; [ qyliss wucke13 ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,30 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git
, alsaLib, gnome3, gtk-layer-shell, pulseaudio, wayfire, wf-config
}:
stdenv.mkDerivation rec {
pname = "wf-shell";
version = "0.6.1";
# > Note to packagers: do not use the autogenerated "Source code"
# > archives from GitHub, but the wf-shell-0.4.0.tar.xz file.
src = fetchurl {
url = "https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz";
sha256 = "0jl8gj185k2ff754lcj5b5nldhkvrhmlaj8lsik4kx78vlb5m3ns";
};
nativeBuildInputs = [ meson ninja pkg-config wayland ];
buildInputs = [
alsaLib gnome3.gtkmm gtk-layer-shell pulseaudio wayfire wf-config
];
mesonFlags = [ "--sysconfdir" "/etc" ];
meta = with lib; {
homepage = "https://github.com/WayfireWM/wf-shell";
description = "GTK3-based panel for Wayfire";
license = licenses.mit;
maintainers = with maintainers; [ qyliss wucke13 ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,39 @@
{ runCommandNoCC, lib, makeWrapper, wayfirePlugins }:
let
inherit (lib) escapeShellArg makeBinPath;
xmlPath = plugin: "${plugin}/share/wayfire/metadata/wf-shell";
makePluginPath = lib.makeLibraryPath;
makePluginXMLPath = lib.concatMapStringsSep ":" xmlPath;
in
application:
choosePlugins:
let
plugins = choosePlugins wayfirePlugins;
in
runCommandNoCC "${application.name}-wrapped" {
nativeBuildInputs = [ makeWrapper ];
passthru = application.passthru // {
unwrapped = application;
};
inherit (application) meta;
} ''
mkdir -p $out/bin
for bin in ${application}/bin/*
do
makeWrapper "$bin" $out/bin/''${bin##*/} \
--suffix PATH : ${escapeShellArg (makeBinPath plugins)} \
--suffix WAYFIRE_PLUGIN_PATH : ${escapeShellArg (makePluginPath plugins)} \
--suffix WAYFIRE_PLUGIN_XML_PATH : ${escapeShellArg (makePluginXMLPath plugins)}
done
find ${application} -mindepth 1 -maxdepth 1 -not -name bin \
-exec ln -s '{}' $out ';'
''

View file

@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
buildInputs = [ gettext libtool makeWrapper texinfo ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A cross-platform file change monitor with multiple backends";
homepage = "https://github.com/emcrisostomo/fswatch";

View file

@ -24751,6 +24751,14 @@ in
way-cooler = throw ("way-cooler is abandoned by its author: " +
"https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html");
wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
inherit (wayfireApplications) wayfire wcm;
wayfireApplications-unwrapped = callPackage ../applications/window-managers/wayfire/applications.nix { };
wayfirePlugins = callPackage ../applications/window-managers/wayfire/plugins.nix {
inherit (wayfireApplications-unwrapped) wayfire;
};
wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { };
waypipe = callPackage ../applications/networking/remote/waypipe { };
wayv = callPackage ../tools/X11/wayv {};