Merge staging-next into staging

  };

  config = mkIf cfg.enable {

    environment.systemPackages = utils.removePackagesByName (with pkgs.xfce // pkgs; [

    environment.systemPackages = utils.removePackagesByName (with pkgs; [

      glib # for gsettings

      gtk3.out # gtk-update-icon-cache

      adwaita-icon-theme

      hicolor-icon-theme

      tango-icon-theme

      xfce4-icon-theme

      xfce.xfce4-icon-theme

      desktop-file-utils

      shared-mime-info # for update-mime-database

      # Needed by Xfce's xinitrc script

      xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/

      exo

      garcon

      libxfce4ui

      mousepad

      parole

      ristretto

      xfce4-appfinder

      xfce4-notifyd

      xfce4-screenshooter

      xfce4-session

      xfce4-settings

      xfce4-taskmanager

      xfce4-terminal

      xfce.exo

      xfce.garcon

      xfce.libxfce4ui

      xfce.mousepad

      xfce.parole

      xfce.ristretto

      xfce.xfce4-appfinder

      xfce.xfce4-notifyd

      xfce.xfce4-screenshooter

      xfce.xfce4-session

      xfce.xfce4-settings

      xfce.xfce4-taskmanager

      xfce.xfce4-terminal

    ] # TODO: NetworkManager doesn't belong here

      ++ optional config.networking.networkmanager.enable networkmanagerapplet

      ++ optional config.powerManagement.enable xfce4-power-manager

      ++ optional config.powerManagement.enable xfce.xfce4-power-manager

      ++ optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [

        pavucontrol

        # volume up/down keys support:

        # xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse

        # but can only be used with xfce4-panel, so for no-desktop usage we still include

        # xfce4-volumed-pulse

        (if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin)

        (if cfg.noDesktop then xfce.xfce4-volumed-pulse else xfce.xfce4-pulseaudio-plugin)

      ] ++ optionals cfg.enableXfwm [

        xfwm4

        xfwm4-themes

        xfce.xfwm4

        xfce.xfwm4-themes

      ] ++ optionals (!cfg.noDesktop) [

        xfce4-panel

        xfdesktop

      ] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages;

        xfce.xfce4-panel

        xfce.xfdesktop

      ] ++ optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages;

    programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2;

    programs.xfconf.enable = true;

From: Geoffrey McRae <geoff@hostfission.com>

Date: Wed, 13 Mar 2024 11:17:25 +1100

Subject: [PATCH] [client] cmake: move X11 config directives to

 `displayservers`

---

 client/CMakeLists.txt                | 7 -------

 client/displayservers/CMakeLists.txt | 7 +++++++

 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git client/CMakeLists.txt client/CMakeLists.txt

index 3755adcf..eeeb3eb0 100644

--- client/CMakeLists.txt

+++ client/CMakeLists.txt

@@ -42,19 +42,12 @@ add_feature_info(ENABLE_ASAN ENABLE_ASAN "AddressSanitizer support.")

 option(ENABLE_UBSAN "Build with UndefinedBehaviorSanitizer" OFF)

 add_feature_info(ENABLE_UBSAN ENABLE_UBSAN "UndefinedBehaviorSanitizer support.")

-option(ENABLE_X11 "Build with X11 support" ON)

-add_feature_info(ENABLE_X11 ENABLE_X11 "X11 support.")

-

 option(ENABLE_PIPEWIRE "Build with PipeWire audio output support" ON)

 add_feature_info(ENABLE_PIPEWIRE ENABLE_PIPEWIRE "PipeWire audio support.")

 option(ENABLE_PULSEAUDIO "Build with PulseAudio audio output support" ON)

 add_feature_info(ENABLE_PULSEAUDIO ENABLE_PULSEAUDIO "PulseAudio audio support.")

-if (NOT ENABLE_X11 AND NOT ENABLE_WAYLAND)

-  message(FATAL_ERROR "Either ENABLE_X11 or ENABLE_WAYLAND must be on")

-endif()

-

 add_compile_options(

   "-Wall"

   "-Wextra"

diff --git client/displayservers/CMakeLists.txt client/displayservers/CMakeLists.txt

index 5b5f827a..e7c4b25a 100644

--- client/displayservers/CMakeLists.txt

+++ client/displayservers/CMakeLists.txt

@@ -18,9 +18,16 @@ function(add_displayserver name)

   add_subdirectory(${name})

 endfunction()

+option(ENABLE_X11 "Build with X11 support" ON)

+add_feature_info(ENABLE_X11 ENABLE_X11 "X11 support.")

+

 option(ENABLE_WAYLAND "Build with Wayland support" ON)

 add_feature_info(ENABLE_WAYLAND ENABLE_WAYLAND "Wayland support.")

+if (NOT ENABLE_X11 AND NOT ENABLE_WAYLAND)

+  message(FATAL_ERROR "Either ENABLE_X11 or ENABLE_WAYLAND must be on")

+endif()

+

 # Add/remove displayservers here!

 if (ENABLE_WAYLAND)

   add_displayserver(Wayland)

--

2.43.1

{ stdenv

, lib

, fetchpatch

, fetchFromGitHub

, makeDesktopItem

, pkg-config

  patches = [

    # Fix failing cmake assertion when disabling X11 whithout explicitly enabling Wayland.

    ./0001-client-cmake-move-X11-config-directives-to-displayse.patch

    (fetchpatch {

      url = "https://github.com/gnif/LookingGlass/commit/20972cfd9b940fddf9e7f3d2887a271d16398979.patch";

      hash = "sha256-CqB8AmOZ4YxnEsQkyu/ZEaun6ywpSh4B7PM+MFJF0qU=";

      stripLen = 1;

    })

  ];

  nativeBuildInputs = [ cmake pkg-config wayland-scanner ];

  indentLines = str: concatLines (map (s: "  " + s) (filter (s: s != "") (splitString "\n" str)));

  bwrapCmd = { initArgs ? "" }: ''

    ${extraPreBwrapCmds}

    ignored=(/nix /dev /proc /etc ${optionalString privateTmp "/tmp"})

    ro_mounts=()

    symlinks=()

    etc_ignored=()

    ${extraPreBwrapCmds}

    # loop through all entries of root in the fhs environment, except its /etc.

    for i in ${fhsenv}/*; do

      path="/''${i##*/}"

stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "arc-browser";

  version = "1.61.0-53949";

  version = "1.61.2-54148";

  src = fetchurl {

    url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";

    hash = "sha256-FuRWi4+vPt31bd3muMDEn3Fu20h9oWEd1XuPJU7W1OU=";

    hash = "sha256-y5oQFPdk6Y7AjzeTrA2U8MhGkPi6RJUcGqsvpjJ++UE=";

  };

  nativeBuildInputs = [ undmg ];