diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-20 14:48:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-20 14:48:46 +0100 |
commit | fbef26df7dde4308991c196fd3914ee8e832a55b (patch) | |
tree | 1a11461c5e99da7227ba083fe68a5bf3a2998418 | |
parent | 9865fb3e2948d085a052cb518e05916827890d8a (diff) | |
parent | 3c687a90109c7976df8af6f5e713b3a01af5ccfc (diff) |
Merge pull request #296981 from Kamillaova/update/rvvm
rvvm: 0.5 -> 0.6
-rw-r--r-- | maintainers/maintainer-list.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/virtualization/rvvm/default.nix | 34 |
2 files changed, 38 insertions, 5 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4889d6a4b2262..fe8edb138530d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -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"; diff --git a/pkgs/applications/virtualization/rvvm/default.nix b/pkgs/applications/virtualization/rvvm/default.nix index b6eaea8d75978..718446d1ce1f6 100644 --- a/pkgs/applications/virtualization/rvvm/default.nix +++ b/pkgs/applications/virtualization/rvvm/default.nix @@ -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"; }; } |