Dandellion
/
NUR
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.dodsorf.as/Dandellion/NUR

This commit is contained in:
Daniel Løvbrøtte Olsen 2020-04-29 01:16:58 +02:00
parent 57dfd5cfff 552d6d1b33
commit d225cb9583
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/MangoHUD/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub { stdenv, lib, fetchFromGitHub
, pkgconfig, ninja, meson , pkgconfig, ninja, meson
, python3Packages, glslang, libglvnd , python3Packages, glslang, libglvnd
, xorg, git, vulkan-loader, vulkan-headers}: , xorg, git, vulkan-loader, vulkan-headers, mesa }:
let let
version = "0.3.1"; version = "0.3.1";
@ -25,7 +25,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
libglvnd glslang python3Packages.Mako libglvnd glslang python3Packages.Mako
xorg.libX11 vulkan-loader vulkan-headers xorg.libX11 vulkan-loader vulkan-headers mesa
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@ -39,4 +39,3 @@ stdenv.mkDerivation {
ln -sf "${vulkan-headers}/include" ./modules/Vulkan-Headers/ ln -sf "${vulkan-headers}/include" ./modules/Vulkan-Headers/
''; '';
} }

8
pkgs/radical-native/default.nix
View File

@ -8,18 +8,18 @@ let
host = host =
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "radical-native"; pname = "radical-native";
version = "0.1.9"; version = "0.1.10";
buildInputs = [ sqlcipher ]; buildInputs = [ sqlcipher ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stoically"; owner = "stoically";
repo = pname; repo = pname;
rev = "v0.1beta9"; rev = "v0.1beta10";
sha256 = "1saaczkpdb61wfdingjvvq25vmyvrlvry7xrdq877i9agzbrzknw"; sha256 = "1gd1k9my7qp2gp8k149ga2dcw14yxxb0ld6j3856wz5a2yr4izi2";
}; };
cargoSha256 = "07499mybgr91kklbxcp3wlj0d2a3d25hj68w98z2xy1j1dkyhyw6"; cargoSha256 = "1ll320ljikrv1v8a7k07smp4syc969fwpxfc2b7axn6pc6l8izi8";
}; };
manifest = pkgs.writeTextFile { manifest = pkgs.writeTextFile {