commit 12b639a80b3bf7e625944d0d2b50d2d3fe090bee

+66 -12

pkgs/applications/window-managers/wayfire/default.nix

··· 1 - { lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config 2 - , cairo, doctest, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland 3 - , wayland-protocols, wf-config, wlroots, mesa 4 }: 5 6 stdenv.mkDerivation rec { 7 pname = "wayfire"; 8 - version = "0.7.2"; 9 10 - src = fetchurl { 11 - url = "https://github.com/WayfireWM/wayfire/releases/download/v${version}/wayfire-${version}.tar.xz"; 12 - sha256 = "1gasijjyfl00zpy6j9hh6qpwv0sw42h9irycbnm693j3vw9mcy66"; 13 }; 14 15 - nativeBuildInputs = [ cmake meson ninja pkg-config wayland ]; 16 buildInputs = [ 17 - cairo doctest libdrm libexecinfo libinput libjpeg libxkbcommon wayland 18 - wayland-protocols wf-config wlroots mesa 19 ]; 20 21 # CMake is just used for finding doctest. 22 dontUseCmakeConfigure = true; 23 24 - mesonFlags = [ "--sysconfdir" "/etc" ]; 25 26 meta = with lib; { 27 homepage = "https://wayfire.org/"; 28 description = "3D Wayland compositor"; 29 license = licenses.mit; 30 - maintainers = with maintainers; [ qyliss wucke13 ]; 31 platforms = platforms.unix; 32 }; 33 }

··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cmake 5 + , meson 6 + , ninja 7 + , pkg-config 8 + , wf-config 9 + , cairo 10 + , doctest 11 + , libdrm 12 + , libexecinfo 13 + , libinput 14 + , libjpeg 15 + , libxkbcommon 16 + , wayland 17 + , wayland-protocols 18 + , wayland-scanner 19 + , wlroots 20 + , pango 21 + , xorg 22 }: 23 24 stdenv.mkDerivation rec { 25 pname = "wayfire"; 26 + version = "0.7.5"; 27 28 + src = fetchFromGitHub { 29 + owner = "WayfireWM"; 30 + repo = pname; 31 + rev = "v${version}"; 32 + fetchSubmodules = true; 33 + sha256 = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is="; 34 }; 35 36 + nativeBuildInputs = [ 37 + meson 38 + ninja 39 + pkg-config 40 + wayland-scanner 41 + ]; 42 + 43 + 44 buildInputs = [ 45 + wf-config 46 + libdrm 47 + libexecinfo 48 + libinput 49 + libjpeg 50 + libxkbcommon 51 + wayland-protocols 52 + xorg.xcbutilwm 53 + wayland 54 + cairo 55 + pango 56 + ]; 57 + 58 + propagatedBuildInputs = [ 59 + wlroots 60 + ]; 61 + 62 + nativeCheckInputs = [ 63 + cmake 64 + doctest 65 ]; 66 67 # CMake is just used for finding doctest. 68 dontUseCmakeConfigure = true; 69 70 + doCheck = true; 71 + 72 + mesonFlags = [ 73 + "--sysconfdir /etc" 74 + "-Duse_system_wlroots=enabled" 75 + "-Duse_system_wfconfig=enabled" 76 + ]; 77 + 78 + passthru.providedSessions = [ "wayfire" ]; 79 80 meta = with lib; { 81 homepage = "https://wayfire.org/"; 82 description = "3D Wayland compositor"; 83 license = licenses.mit; 84 + maintainers = with maintainers; [ qyliss wucke13 rewine ]; 85 platforms = platforms.unix; 86 }; 87 }

+44 -10

pkgs/applications/window-managers/wayfire/wcm.nix

··· 1 - { stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, wrapGAppsHook 2 - , gtk3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell 3 }: 4 5 stdenv.mkDerivation rec { 6 pname = "wcm"; 7 - version = "0.7.0"; 8 9 - src = fetchurl { 10 - url = "https://github.com/WayfireWM/wcm/releases/download/v${version}/wcm-${version}.tar.xz"; 11 - sha256 = "19za1fnlf5hz4n4mxxwqcr5yxp6mga9ah539ifnjnqrgvj19cjlj"; 12 }; 13 14 - nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ]; 15 buildInputs = [ 16 - gtk3 libevdev libxml2 wayfire wayland 17 - wayland-protocols wf-config wf-shell 18 ]; 19 20 meta = with lib; { 21 homepage = "https://github.com/WayfireWM/wcm"; 22 description = "Wayfire Config Manager"; 23 license = licenses.mit; 24 - maintainers = with maintainers; [ qyliss wucke13 ]; 25 platforms = platforms.unix; 26 }; 27 }

··· 1 + { stdenv 2 + , lib 3 + , fetchFromGitHub 4 + , meson 5 + , ninja 6 + , pkg-config 7 + , wayland 8 + , wrapGAppsHook 9 + , wayfire 10 + , wf-shell 11 + , wf-config 12 + , wayland-scanner 13 + , wayland-protocols 14 + , gtk3 15 + , libevdev 16 + , libxml2 17 }: 18 19 stdenv.mkDerivation rec { 20 pname = "wcm"; 21 + version = "0.7.5"; 22 23 + src = fetchFromGitHub { 24 + owner = "WayfireWM"; 25 + repo = pname; 26 + rev = "v${version}"; 27 + fetchSubmodules = true; 28 + sha256 = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU="; 29 }; 30 31 + nativeBuildInputs = [ 32 + meson 33 + ninja 34 + pkg-config 35 + wayland-scanner 36 + wrapGAppsHook 37 + ]; 38 + 39 buildInputs = [ 40 + wayfire 41 + wf-config 42 + wf-shell 43 + wayland 44 + wayland-protocols 45 + gtk3 46 + libevdev 47 + libxml2 48 + ]; 49 + 50 + mesonFlags = [ 51 + "-Denable_wdisplays=false" 52 ]; 53 54 meta = with lib; { 55 homepage = "https://github.com/WayfireWM/wcm"; 56 description = "Wayfire Config Manager"; 57 license = licenses.mit; 58 + maintainers = with maintainers; [ qyliss wucke13 rewine ]; 59 platforms = platforms.unix; 60 }; 61 }

+35 -9

pkgs/applications/window-managers/wayfire/wf-config.nix

··· 1 - { stdenv, lib, fetchurl, cmake, meson, ninja, pkg-config 2 - , doctest, glm, libevdev, libxml2 3 }: 4 5 stdenv.mkDerivation rec { 6 pname = "wf-config"; 7 version = "0.7.1"; 8 9 - src = fetchurl { 10 - url = "https://github.com/WayfireWM/wf-config/releases/download/v${version}/wf-config-${version}.tar.xz"; 11 - sha256 = "1w75yxhz0nvw4mlv38sxp8k8wb5h99b51x3fdvizc3yaxanqa8kx"; 12 }; 13 14 - nativeBuildInputs = [ cmake meson ninja pkg-config ]; 15 - buildInputs = [ doctest libevdev libxml2 ]; 16 - propagatedBuildInputs = [ glm ]; 17 18 # CMake is just used for finding doctest. 19 dontUseCmakeConfigure = true; 20 ··· 24 homepage = "https://github.com/WayfireWM/wf-config"; 25 description = "Library for managing configuration files, written for Wayfire"; 26 license = licenses.mit; 27 - maintainers = with maintainers; [ qyliss wucke13 ]; 28 platforms = platforms.unix; 29 }; 30 }

··· 1 + { stdenv 2 + , lib 3 + , fetchFromGitHub 4 + , cmake 5 + , meson 6 + , ninja 7 + , pkg-config 8 + , doctest 9 + , glm 10 + , libevdev 11 + , libxml2 12 }: 13 14 stdenv.mkDerivation rec { 15 pname = "wf-config"; 16 version = "0.7.1"; 17 18 + src = fetchFromGitHub { 19 + owner = "WayfireWM"; 20 + repo = pname; 21 + rev = "v${version}"; 22 + sha256 = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA="; 23 }; 24 25 + nativeBuildInputs = [ 26 + meson 27 + ninja 28 + pkg-config 29 + ]; 30 31 + buildInputs = [ 32 + libevdev 33 + libxml2 34 + ]; 35 + 36 + propagatedBuildInputs = [ 37 + glm 38 + ]; 39 + 40 + nativeCheckInputs = [ 41 + cmake 42 + doctest 43 + ]; 44 # CMake is just used for finding doctest. 45 dontUseCmakeConfigure = true; 46 ··· 50 homepage = "https://github.com/WayfireWM/wf-config"; 51 description = "Library for managing configuration files, written for Wayfire"; 52 license = licenses.mit; 53 + maintainers = with maintainers; [ qyliss wucke13 rewine ]; 54 platforms = platforms.unix; 55 }; 56 }

+34 -10

pkgs/applications/window-managers/wayfire/wf-shell.nix

··· 1 - { stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, alsa-lib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config 2 }: 3 4 stdenv.mkDerivation rec { 5 pname = "wf-shell"; 6 version = "0.7.0"; 7 8 - # > Note to packagers: do not use the autogenerated "Source code" 9 - # > archives from GitHub, but the wf-shell-0.4.0.tar.xz file. 10 - src = fetchurl { 11 - url = "https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz"; 12 - sha256 = "1isybm9lcpxwyf6zh2vzkwrcnw3q7qxm21535g4f08f0l68cd5bl"; 13 }; 14 15 - nativeBuildInputs = [ meson ninja pkg-config wayland ]; 16 buildInputs = [ 17 - alsa-lib gtkmm3 gtk-layer-shell pulseaudio wayfire wf-config 18 ]; 19 20 - mesonFlags = [ "--sysconfdir" "/etc" ]; 21 22 meta = with lib; { 23 homepage = "https://github.com/WayfireWM/wf-shell"; 24 description = "GTK3-based panel for Wayfire"; 25 license = licenses.mit; 26 - maintainers = with maintainers; [ qyliss wucke13 ]; 27 platforms = platforms.unix; 28 }; 29 }

··· 1 + { stdenv 2 + , lib 3 + , fetchFromGitHub 4 + , meson 5 + , ninja 6 + , pkg-config 7 + , wayland-scanner 8 + , wayfire 9 + , wf-config 10 + , alsa-lib 11 + , gtkmm3 12 + , gtk-layer-shell 13 + , pulseaudio 14 }: 15 16 stdenv.mkDerivation rec { 17 pname = "wf-shell"; 18 version = "0.7.0"; 19 20 + src = fetchFromGitHub { 21 + owner = "WayfireWM"; 22 + repo = pname; 23 + rev = "v${version}"; 24 + fetchSubmodules = true; 25 + sha256 = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA="; 26 }; 27 28 + nativeBuildInputs = [ 29 + meson 30 + ninja 31 + pkg-config 32 + wayland-scanner 33 + ]; 34 + 35 buildInputs = [ 36 + wayfire 37 + wf-config 38 + alsa-lib 39 + gtkmm3 40 + gtk-layer-shell 41 + pulseaudio 42 ]; 43 44 + mesonFlags = [ "--sysconfdir /etc" ]; 45 46 meta = with lib; { 47 homepage = "https://github.com/WayfireWM/wf-shell"; 48 description = "GTK3-based panel for Wayfire"; 49 license = licenses.mit; 50 + maintainers = with maintainers; [ qyliss wucke13 rewine ]; 51 platforms = platforms.unix; 52 }; 53 }

+1 -1

pkgs/top-level/all-packages.nix

··· 34563 inherit (wayfireApplications) wayfire wcm; 34564 wayfireApplications-unwrapped = recurseIntoAttrs ( 34565 (callPackage ../applications/window-managers/wayfire/applications.nix { }). 34566 - extend (_: _: { wlroots = wlroots_0_14; }) 34567 ); 34568 wayfirePlugins = recurseIntoAttrs ( 34569 callPackage ../applications/window-managers/wayfire/plugins.nix {

··· 34563 inherit (wayfireApplications) wayfire wcm; 34564 wayfireApplications-unwrapped = recurseIntoAttrs ( 34565 (callPackage ../applications/window-managers/wayfire/applications.nix { }). 34566 + extend (_: _: { wlroots = wlroots_0_16; }) 34567 ); 34568 wayfirePlugins = recurseIntoAttrs ( 34569 callPackage ../applications/window-managers/wayfire/plugins.nix {