more packaging of janusVR
This commit is contained in:
		
							parent
							
								
									f2d588fff4
								
							
						
					
					
						commit
						eb01ed1d1e
					
				@ -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 { };
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -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*"
 | 
			
		||||
  '';
 | 
			
		||||
 | 
			
		||||
  meta = {
 | 
			
		||||
  installPhase = ''
 | 
			
		||||
    mkdir -p $out/bin $out/lib
 | 
			
		||||
    cp -v janusvr $out/bin
 | 
			
		||||
    cp -v dependencies/linux/libopenvr_api.so $out/lib
 | 
			
		||||
  '';
 | 
			
		||||
  
 | 
			
		||||
  meta = with lib; {
 | 
			
		||||
    description = "VR Social app like the web";
 | 
			
		||||
    broken = false;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user