Merge branch 'master' of https://git.dodsorf.as/Dandellion/NUR
This commit is contained in:
		
						commit
						d225cb9583
					
				@ -1,7 +1,7 @@
 | 
			
		||||
{ stdenv, lib, fetchFromGitHub
 | 
			
		||||
, pkgconfig, ninja, meson
 | 
			
		||||
, python3Packages, glslang, libglvnd
 | 
			
		||||
, xorg, git, vulkan-loader, vulkan-headers}:
 | 
			
		||||
, xorg, git, vulkan-loader, vulkan-headers, mesa }:
 | 
			
		||||
 | 
			
		||||
let
 | 
			
		||||
  version = "0.3.1";
 | 
			
		||||
@ -25,7 +25,7 @@ stdenv.mkDerivation {
 | 
			
		||||
 | 
			
		||||
  buildInputs = [
 | 
			
		||||
    libglvnd glslang python3Packages.Mako
 | 
			
		||||
    xorg.libX11 vulkan-loader vulkan-headers
 | 
			
		||||
    xorg.libX11 vulkan-loader vulkan-headers mesa
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  nativeBuildInputs = [
 | 
			
		||||
@ -39,4 +39,3 @@ stdenv.mkDerivation {
 | 
			
		||||
    ln -sf "${vulkan-headers}/include" ./modules/Vulkan-Headers/
 | 
			
		||||
  '';
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -8,18 +8,18 @@ let
 | 
			
		||||
  host = 
 | 
			
		||||
    rustPlatform.buildRustPackage rec {
 | 
			
		||||
      pname = "radical-native";
 | 
			
		||||
      version = "0.1.9";
 | 
			
		||||
      version = "0.1.10";
 | 
			
		||||
 | 
			
		||||
      buildInputs = [ sqlcipher ];
 | 
			
		||||
 | 
			
		||||
      src = fetchFromGitHub {
 | 
			
		||||
        owner = "stoically";
 | 
			
		||||
        repo = pname;
 | 
			
		||||
        rev = "v0.1beta9";
 | 
			
		||||
        sha256 = "1saaczkpdb61wfdingjvvq25vmyvrlvry7xrdq877i9agzbrzknw";
 | 
			
		||||
        rev = "v0.1beta10";
 | 
			
		||||
        sha256 = "1gd1k9my7qp2gp8k149ga2dcw14yxxb0ld6j3856wz5a2yr4izi2";
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
      cargoSha256 = "07499mybgr91kklbxcp3wlj0d2a3d25hj68w98z2xy1j1dkyhyw6";
 | 
			
		||||
      cargoSha256 = "1ll320ljikrv1v8a7k07smp4syc969fwpxfc2b7axn6pc6l8izi8";
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
  manifest = pkgs.writeTextFile {
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user