alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

sway: remove unused build inputs (#237625)

Browse source 
None of these have been used since before Sway 1.0.
This commit is contained in:
Alyssa Ross 2023-06-13 22:25:02 +00:00 committed by GitHub
parent 8d5640f72d
commit d40add3bc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/window-managers/sway/default.nix
View file

@ -1,23 +1,21 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg { lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg
, meson, ninja, pkg-config, wayland-scanner, scdoc , meson, ninja, pkg-config, wayland-scanner, scdoc
, wayland, libxkbcommon, pcre2, json_c, libevdev , wayland, libxkbcommon, pcre2, json_c, libevdev
, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , pango, cairo, libinput, gdk-pixbuf, librsvg
, wlroots_0_16, wayland-protocols, libdrm , wlroots_0_16, wayland-protocols, libdrm
, nixosTests , nixosTests
# Used by the NixOS module: # Used by the NixOS module:
, isNixOS ? false , isNixOS ? false
, enableXWayland ? true, xorg , enableXWayland ? true, xorg
, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
, dbusSupport ? true , trayEnabled ? systemdSupport
, dbus
, trayEnabled ? systemdSupport && dbusSupport
}: }:
# The "sd-bus-provider" meson option does not include a "none" option, # The "sd-bus-provider" meson option does not include a "none" option,
# but it is silently ignored iff "-Dtray=disabled". We use "basu" # but it is silently ignored iff "-Dtray=disabled". We use "basu"
# (which is not in nixpkgs) instead of "none" to alert us if this # (which is not in nixpkgs) instead of "none" to alert us if this
# changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761 # changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761
assert trayEnabled -> systemdSupport && dbusSupport; assert trayEnabled -> systemdSupport;
let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -65,11 +63,9 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
wayland libxkbcommon pcre2 json_c libevdev wayland libxkbcommon pcre2 json_c libevdev
pango cairo libinput libcap pam gdk-pixbuf librsvg pango cairo libinput gdk-pixbuf librsvg
wayland-protocols libdrm wayland-protocols libdrm
(wlroots_0_16.override { inherit enableXWayland; }) (wlroots_0_16.override { inherit enableXWayland; })
] ++ lib.optionals dbusSupport [
dbus
] ++ lib.optionals enableXWayland [ ] ++ lib.optionals enableXWayland [
xorg.xcbutilwm xorg.xcbutilwm
]; ];