nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #329375 from Scrumplex/pkgs/opencomposite/update-jsoncpp

Browse Source 
opencomposite: 0-unstable-2024-06-12 -> 0-unstable-2024-07-23
This commit is contained in:
Peder Bergebakken Sundt 2024-07-27 18:37:03 +02:00 committed by GitHub
commit 933c387410
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pkgs/by-name/op/opencomposite/package.nix
View File

@ -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,19 +39,11 @@ stdenv.mkDerivation {
];
cmakeFlags = [
(lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=format-security")
(lib.cmakeBool "USE_SYSTEM_OPENXR" true)
(lib.cmakeBool "USE_SYSTEM_GLM" true)
];
# NOTE: `cmakeFlags` will get later tokenized by bash and there is no way
# of inserting a flag value with a space in it (inserting `"` or `'` won't help).
# https://discourse.nixos.org/t/cmakeflags-and-spaces-in-option-values/20170/2
preConfigure = ''
cmakeFlagsArray+=(
"-DCMAKE_CXX_FLAGS=-DGLM_ENABLE_EXPERIMENTAL -Wno-error=format-security"
)
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib/opencomposite
@ -66,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 ];
};
}