Merge pull request #308375 from kira-bruneau/rmg
rmg: add option to build with experimental wayland support
This commit is contained in:
commit
369654d204
@ -20,12 +20,13 @@
|
||||
, which
|
||||
, xdg-user-dirs
|
||||
, zlib
|
||||
, withWayland ? false
|
||||
# Affects final license
|
||||
, withAngrylionRdpPlus ? false
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (qt6Packages) qtbase qtsvg wrapQtAppsHook;
|
||||
inherit (qt6Packages) qtbase qtsvg qtwayland wrapQtAppsHook;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rmg";
|
||||
@ -72,7 +73,7 @@ stdenv.mkDerivation rec {
|
||||
vulkan-loader
|
||||
xdg-user-dirs
|
||||
zlib
|
||||
];
|
||||
] ++ lib.optional withWayland qtwayland;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPORTABLE_INSTALL=OFF"
|
||||
@ -84,7 +85,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
qtWrapperArgs = lib.optionals stdenv.isLinux [
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}"
|
||||
];
|
||||
] ++ lib.optional withWayland "--set RMG_WAYLAND 1";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Rosalie241/RMG";
|
||||
|
@ -2781,6 +2781,10 @@ with pkgs;
|
||||
|
||||
ripes = qt6Packages.callPackage ../applications/emulators/ripes { };
|
||||
|
||||
rmg-wayland = callPackage ../by-name/rm/rmg/package.nix {
|
||||
withWayland = true;
|
||||
};
|
||||
|
||||
rpcemu = callPackage ../applications/emulators/rpcemu { };
|
||||
|
||||
ruffle = callPackage ../applications/emulators/ruffle { };
|
||||
|
Loading…
Reference in New Issue
Block a user