From eb01ed1d1ee918fd5b448d9ee66dfd7eb3c5ab35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Fri, 22 Nov 2019 07:48:32 +0100 Subject: [PATCH] more packaging of janusVR --- default.nix | 2 +- pkgs/JanusVR/client/default.nix | 30 ++++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/default.nix b/default.nix index b051652..0ef2053 100644 --- a/default.nix +++ b/default.nix @@ -20,6 +20,6 @@ rank_photos = pkgs.callPackage ./pkgs/rank_photos { }; JAVMovieScraper = pkgs.callPackage ./pkgs/JAVMovieScraper { }; - janus = pkgs.callPackage ./pkgs/JanusVR/client { }; + janus = pkgs.libsForQt5.callPackage ./pkgs/JanusVR/client { }; } diff --git a/pkgs/JanusVR/client/default.nix b/pkgs/JanusVR/client/default.nix index a397088..a4bc87c 100644 --- a/pkgs/JanusVR/client/default.nix +++ b/pkgs/JanusVR/client/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, bullet, libopus, qt5, mesa_glu, vlc, openal, assimp, pkgconfig, tree }: +{ mkDerivation, lib, fetchFromGitHub, bullet, libopus, qtbase, qt5, mesa_glu, vlc, openal, assimp, pkgconfig, tree, git, git-lfs, libxcb }: -stdenv.mkDerivation { +mkDerivation { pname = "janus"; version = "66.4"; @@ -23,22 +23,40 @@ stdenv.mkDerivation { libopus openal assimp + # libxcb ]; nativeBuildInputs = [ - pkgconfig + # pkgconfig + git + git-lfs ]; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${bullet}/include/bullet" + export BUILD_DIR="dist/linux/" + + #qmake FireBox.pro -spec linux-g++ CONFIG+=release CONFIG+=force_debug_info + + touch riftid.txt ''; - BuildPhase = '' - tree . +# buildPhase = '' +# make +# ''; + + postBuild = '' + find . -name "*openvr*" + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp -v janusvr $out/bin + cp -v dependencies/linux/libopenvr_api.so $out/lib ''; - meta = { + meta = with lib; { description = "VR Social app like the web"; broken = false; };