Unverified Commit bfad2e8e authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

wivrn: 25.12 -> 26.2 (#488408)

parents 3afdb93b a2b56160
Loading
Loading
Loading
Loading
+15 −10
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ let
  serverExec = concatStringsSep " " (
    [
      serverPackageExe
      "--systemd"
      enabledConfig
    ]
    ++ cfg.extraServerFlags
@@ -126,24 +125,29 @@ in
            Like upstream, the application option is a list including the application and it's flags. In the case of the NixOS module however, the first element of the list must be a package. The module will assert otherwise.
            The application can be set to a single package because it gets passed to lib.toList, though this will not allow for flags to be passed.

            WiVRn has good default configurations and most options can be configured at runtime so it is recommended to leave this empty and try the defaults before attempting manual configuration.

            See <https://github.com/WiVRn/WiVRn/blob/master/docs/configuration.md>
          '';
          default = { };
          example = literalExpression ''
            {
              scale = 0.5;
              bitrate = 100000000;
              encoders = [
              # left eye, hardware; right eye, software; transparency, hardware
              encoder = [
                {
                  encoder = "vulkan";
                  codec = "h265";
                }
                {
                  encoder = "nvenc";
                  encoder = "x264";
                  codec = "h264";
                  width = 1.0;
                  height = 1.0;
                  offset_x = 0.0;
                  offset_y = 0.0;
                }
                {
                  encoder = "vulkan";
                  codec = "h265";
                }
              ];
              application = [ pkgs.wlx-overlay-s ];
              application = [ pkgs.wayvr ];
            }
          '';
        };
@@ -206,6 +210,7 @@ in
                RestrictSUIDSGID = true;
              }
          );
          # Needs Steam in the PATH to allow launching games from the headset
          path = [ cfg.steam.package ];
          wantedBy = mkIf cfg.autoStart [ "default.target" ];
          restartTriggers = [
+4 −7
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@
  stdenv,
  fetchFromGitHub,
  fetchFromGitLab,
  fetchpatch,
  applyPatches,
  autoAddDriverRunpath,
  avahi,
@@ -34,7 +33,6 @@
  makeDesktopItem,
  nix-update-script,
  nlohmann_json,
  onnxruntime,
  opencomposite,
  openxr-loader,
  ovrCompatSearchPaths ? "${xrizer}/lib/xrizer:${opencomposite}/lib/opencomposite",
@@ -43,7 +41,6 @@
  python3,
  qt6,
  shaderc,
  spdlog,
  systemd,
  udev,
  vulkan-headers,
@@ -56,13 +53,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
  pname = "wivrn";
  version = "25.12";
  version = "26.2";

  src = fetchFromGitHub {
    owner = "wivrn";
    repo = "wivrn";
    rev = "v${finalAttrs.version}";
    hash = "sha256-gadfW3/PXi9SEztaHbi4U29Vj7ik/ia8BVDTy8P5aJE=";
    hash = "sha256-wVFC8VDtALHI6e0655Ytc4gNOPnJP65XWNzlhzH2eoc=";
  };

  monado = applyPatches {
@@ -70,8 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
      domain = "gitlab.freedesktop.org";
      owner = "monado";
      repo = "monado";
      rev = "20e0dacbdd2de863923790326beec76e848b056a";
      hash = "sha256-wiXdMgp3bKW17KqLnSn6HHhz7xbQtjp4c3aU7qp+2BE=";
      rev = "9dcc3e1de2f7449d9757f5db332c867b4d794fb3";
      hash = "sha256-ueg/GDnKP4nRVepdNE3sgK8sYckZc0aaC0CQc3tuxik=";
    };

    postPatch = ''