diff options
Diffstat (limited to 'pkgs/by-name/op/opencomposite/package.nix')
-rw-r--r-- | pkgs/by-name/op/opencomposite/package.nix | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index 173e4b05d76fb..db42ea0f9f784 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -1,37 +1,35 @@ -{ lib -, stdenv -, fetchFromGitLab - -, cmake - -, glm -, libGL -, openxr-loader -, python3 -, vulkan-headers -, vulkan-loader -, xorg - -, unstableGitUpdater +{ + cmake, + fetchFromGitLab, + glm, + jsoncpp, + lib, + libGL, + openxr-loader, + python3, + stdenv, + unstableGitUpdater, + vulkan-headers, + vulkan-loader, + xorg, }: stdenv.mkDerivation { pname = "opencomposite"; - version = "0-unstable-2024-06-12"; + version = "0-unstable-2024-07-23"; src = fetchFromGitLab { owner = "znixian"; repo = "OpenOVR"; - rev = "de1658db7e2535fd36c2e37fa8dd3d756280c86f"; - hash = "sha256-xyEiuEy3nt2AbF149Pjz5wi/rkTup2SgByR4DrNOJX0="; + rev = "632e5cc50b913e93194ca2970e6f13021182579f"; + hash = "sha256-KQmNyGRlbUrntTPNn5rzTyyR+Bvh3EfSqBgyNGGDo04="; }; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ glm + jsoncpp libGL openxr-loader python3 @@ -41,10 +39,9 @@ stdenv.mkDerivation { ]; cmakeFlags = [ + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=format-security") (lib.cmakeBool "USE_SYSTEM_OPENXR" true) (lib.cmakeBool "USE_SYSTEM_GLM" true) - # debug logging macros cause format-security warnings - (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=format-security") ]; installPhase = '' @@ -59,10 +56,10 @@ stdenv.mkDerivation { branch = "openxr"; }; - meta = with lib; { + meta = { description = "Reimplementation of OpenVR, translating calls to OpenXR"; homepage = "https://gitlab.com/znixian/OpenOVR"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ Scrumplex ]; + license = with lib.licenses; [ gpl3Only ]; + maintainers = with lib.maintainers; [ Scrumplex ]; }; } |