diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-03 06:01:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-03 06:01:07 +0000 |
| commit | 095591c0d4295d743fc062dd3a4ad5dc831b89c4 (patch) | |
| tree | 15ade23801824065e874284cfe29edcb61d50eff /pkgs/by-name/rm | |
| parent | 3588aea450a1b8aba27d8d471e4dc48589c6e7f2 (diff) | |
| parent | 79691a0162e1bb3520f78a07e2845929a6cbc0d2 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/by-name/rm')
| -rw-r--r-- | pkgs/by-name/rm/rmg/package.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index 50436f36b9289..4c2643346a44a 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -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"; |