From f2d588fff4df9f5e9dbb6d3678178fc4bf94246c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Wed, 20 Nov 2019 15:29:38 +0100 Subject: [PATCH] more janus --- pkgs/JanusVR/client/default.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/JanusVR/client/default.nix b/pkgs/JanusVR/client/default.nix index fc7f0b3..a397088 100644 --- a/pkgs/JanusVR/client/default.nix +++ b/pkgs/JanusVR/client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bullet, libopus, qt5, mesa_glu, vlc }: +{ stdenv, fetchFromGitHub, bullet, libopus, qt5, mesa_glu, vlc, openal, assimp, pkgconfig, tree }: stdenv.mkDerivation { pname = "janus"; @@ -12,6 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ + tree mesa_glu vlc qt5.qmake @@ -20,14 +21,26 @@ stdenv.mkDerivation { qt5.qtscript bullet libopus + openal + assimp ]; -# installPhase = '' -# ''; + nativeBuildInputs = [ + pkgconfig + ]; + + + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${bullet}/include/bullet" + ''; + + BuildPhase = '' + tree . + ''; meta = { description = "VR Social app like the web"; - broken = true; + broken = false; }; }