Unverified Commit f4b5012a authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

wivrn: 0.24 -> 0.24.1 (#400093)

parents 29a71b2c abec03b6

pkgs/by-name/wi/wivrn/package.nix

+10 −61
Original line number Diff line number Diff line 
{

  # Commented packages are not currently in nixpkgs. They don't appear to cause a problem when not present.

  config,

  lib,

  stdenv,
@@ -8,82 +7,57 @@ 
  applyPatches,

  autoAddDriverRunpath,

  avahi,

  bluez,

  boost,

  cjson,

  cli11,

  cmake,

  cudaPackages ? { },

  cudaSupport ? config.cudaSupport,

  dbus,

  # depthai

  doxygen,

  eigen,

  elfutils,

  ffmpeg,

  freetype,

  git,

  glib,

  glm,

  glslang,

  gst_all_1,

  harfbuzz,

  hidapi,

  kdePackages,

  # leapsdk

  # leapv2

  libGL,

  libX11,

  libXrandr,

  libbsd,

  libdrm,

  libjpeg,

  libmd,

  libGL,

  libnotify,

  libpulseaudio,

  librealsense,

  librsvg,

  libsurvive,

  libunwind,

  libusb1,

  libuvc,

  libva,

  libX11,

  libXrandr,

  makeDesktopItem,

  nix-update-script,

  nlohmann_json,

  onnxruntime,

  opencomposite,

  opencv4,

  openhmd,

  openvr,

  openxr-loader,

  orc,

  # percetto

  ovrCompatSearchPaths ? "${opencomposite}/lib/opencomposite:${xrizer}/lib/xrizer",

  pipewire,

  pkg-config,

  python3,

  qt6,

  SDL2,

  shaderc,

  spdlog,

  systemd,

  udev,

  vulkan-headers,

  vulkan-loader,

  wayland,

  wayland-protocols,

  wayland-scanner,

  x264,

  xrizer,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "wivrn";

  version = "0.24";

  version = "0.24.1";



  src = fetchFromGitHub {

    owner = "wivrn";

    repo = "wivrn";

    rev = "v${finalAttrs.version}";

    hash = "sha256-0F+JHhVT/Axo+ycoh/qCL/jVncD+GrcuvYrxKE+UFGc=";

    hash = "sha256-aWQcGIrBoDAO7XqWb3dQLBKg5RZYxC7JxwZ+OBSwmEs=";

  };



  monado = applyPatches {
@@ -106,8 +80,8 @@ stdenv.mkDerivation (finalAttrs: { 


  strictDeps = true;



  postUnpack = ''

  # Let's make sure our monado source revision matches what is used by WiVRn upstream

  postUnpack = ''

    ourMonadoRev="${finalAttrs.monado.src.rev}"

    theirMonadoRev=$(sed -n '/FetchContent_Declare(monado/,/)/p' ${finalAttrs.src.name}/CMakeLists.txt | grep "GIT_TAG" | awk '{print $2}')

    if [ ! "$theirMonadoRev" == "$ourMonadoRev" ]; then
@@ -121,7 +95,6 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeBuildInputs =

    [

      cmake

      doxygen

      git

      glib

      glslang
@@ -138,62 +111,38 @@ stdenv.mkDerivation (finalAttrs: { 
    [

      avahi

      boost

      bluez

      cjson

      cli11

      dbus

      eigen

      elfutils

      ffmpeg

      freetype

      glib

      glm

      gst_all_1.gst-plugins-base

      gst_all_1.gstreamer

      harfbuzz

      hidapi

      kdePackages.kcoreaddons

      kdePackages.ki18n

      kdePackages.kiconthemes

      kdePackages.kirigami

      kdePackages.qcoro

      kdePackages.qqc2-desktop-style

      libbsd

      libdrm

      libGL

      libjpeg

      libmd

      libnotify

      librealsense

      libsurvive

      libunwind

      libusb1

      libuvc

      libpulseaudio

      libva

      libX11

      libXrandr

      libpulseaudio

      nlohmann_json

      opencv4

      openhmd

      openvr

      openxr-loader

      onnxruntime

      orc

      pipewire

      qt6.qtbase

      qt6.qtsvg

      qt6.qttools

      SDL2

      shaderc

      spdlog

      systemd

      udev

      vulkan-headers

      vulkan-loader

      wayland

      wayland-protocols

      wayland-scanner

      x264

    ]

    ++ lib.optionals cudaSupport [
@@ -214,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { 
      (lib.cmakeBool "WIVRN_CHECK_CAPSYSNICE" false)

      (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)

      (lib.cmakeFeature "WIVRN_OPENXR_MANIFEST_TYPE" "absolute")

      (lib.cmakeFeature "OPENCOMPOSITE_SEARCH_PATH" "${opencomposite}/lib/opencomposite")

      (lib.cmakeFeature "OVR_COMPAT_SEARCH_PATH" ovrCompatSearchPaths)

      (lib.cmakeFeature "GIT_DESC" "v${finalAttrs.version}")

      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}")

    ]