opencomposite: 0-unstable-2024-06-12 -> 0-unstable-2024-07-23

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu 2024-07-23 12:21:49 +02:00
parent c93b788bd3
commit 5fb17bc7b9
No known key found for this signature in database
GPG Key ID: E13DFD4B47127951

View File

@ -5,6 +5,7 @@
, cmake , cmake
, glm , glm
, jsoncpp
, libGL , libGL
, openxr-loader , openxr-loader
, python3 , python3
@ -17,13 +18,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "opencomposite"; pname = "opencomposite";
version = "0-unstable-2024-06-12"; version = "0-unstable-2024-07-23";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "znixian"; owner = "znixian";
repo = "OpenOVR"; repo = "OpenOVR";
rev = "de1658db7e2535fd36c2e37fa8dd3d756280c86f"; rev = "632e5cc50b913e93194ca2970e6f13021182579f";
hash = "sha256-xyEiuEy3nt2AbF149Pjz5wi/rkTup2SgByR4DrNOJX0="; hash = "sha256-KQmNyGRlbUrntTPNn5rzTyyR+Bvh3EfSqBgyNGGDo04=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -32,6 +33,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
glm glm
jsoncpp
libGL libGL
openxr-loader openxr-loader
python3 python3
@ -41,19 +43,11 @@ stdenv.mkDerivation {
]; ];
cmakeFlags = [ cmakeFlags = [
(lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=format-security")
(lib.cmakeBool "USE_SYSTEM_OPENXR" true) (lib.cmakeBool "USE_SYSTEM_OPENXR" true)
(lib.cmakeBool "USE_SYSTEM_GLM" 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 = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out/lib/opencomposite mkdir -p $out/lib/opencomposite