nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #296981 from Kamillaova/update/rvvm

Browse Source 
rvvm: 0.5 -> 0.6
This commit is contained in:
Weijia Wang 2024-03-20 14:48:46 +01:00 committed by GitHub
commit fbef26df7d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maintainers/maintainer-list.nix
View File

@ -9956,6 +9956,15 @@
githubId = 1621930;
name = "Kamil Chmielewski";
};
kamillaova = {
name = "Kamilla Ova";
email = "me@kamillaova.dev";
github = "Kamillaova";
githubId = 54859825;
keys = [{
fingerprint = "B2D0 AA53 8DBE 60B0 0811 3FC0 2D52 5F67 791E 5834";
}];
};
kampfschlaefer = {
email = "arnold@arnoldarts.de";
github = "kampfschlaefer";

34
pkgs/applications/virtualization/rvvm/default.nix
View File

@ -1,21 +1,45 @@
{ lib, stdenv, fetchFromGitHub, SDL_compat, libX11, libXext }:
{ lib
, stdenv
, fetchFromGitHub
, SDL2
, libX11
, libXext
, guiBackend ? "sdl"
, enableSDL ? guiBackend == "sdl"
, enableX11 ? guiBackend == "x11"
}:
assert lib.assertMsg (builtins.elem guiBackend ["sdl" "x11" "none"]) "Unsupported GUI backend";
assert lib.assertMsg (!(enableSDL && enableX11)) "RVVM can have only one GUI backend at a time";
assert lib.assertMsg (stdenv.isDarwin -> !enableX11) "macOS supports only SDL GUI backend";
stdenv.mkDerivation rec {
pname = "rvvm";
version = "0.5";
version = "0.6";
src = fetchFromGitHub {
owner = "LekKit";
repo = "RVVM";
rev = "v${version}";
sha256 = "sha256-1wAKijRYB0FGBe4cSHUynkO4ePVG4QvVIgSoWzNbqtE=";
sha256 = "sha256-5nSlKyWDAx0EeKFzzwP5+99XuJz9BHXEF1WNkRMLa9U=";
};
buildInputs = if stdenv.isDarwin then [ SDL_compat ] else [ libX11 libXext ];
buildInputs = []
++ lib.optionals enableSDL [ SDL2 ]
++ lib.optionals enableX11 [ libX11 libXext ];
enableParallelBuilding = true;
buildFlags = [ "all" "lib" ];
makeFlags = [ "PREFIX=$(out)" ]
++ lib.optional enableSDL "USE_SDL=2" # Use SDL2 instead of SDL1
++ lib.optional (!enableSDL && !enableX11) "USE_FB=0"
# work around https://github.com/NixOS/nixpkgs/issues/19098
++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "CFLAGS=-fno-lto";
@ -24,7 +48,7 @@ stdenv.mkDerivation rec {
description = "The RISC-V Virtual Machine";
license = with licenses; [ gpl3 /* or */ mpl20 ];
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ kamillaova ];
mainProgram = "rvvm";
};
}