Android and Desktop now building in the rider-fhs nix shell.

rider-fhs.nix

@@ -0,0 +1,46 @@
+{ pkgs ? import <nixpkgs> {
+  config.allowUnfree = true;
+  config.android_sdk.accept_license = true;
+  overlays = [
+    (self: super: {
+      jetbrains = super.jetbrains // {
+        rider = super.jetbrains.rider.overrideAttrs (oldAttrs: rec {
+          version = "2025.3.1";
+          src = super.fetchurl {
+            url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
+            sha256 = "sha256-uoQPfEjafxGM9Xqowi3zASDRbxdfvOO+xqZVkO2H8ug=";
+          };
+        });
+      };
+
+      androidPkgs_34 = super.androidenv.composeAndroidPackages {
+        platformVersions = [ "34" ];
+        buildToolsVersions = [ "34.0.0" ];
+        abiVersions = [ "x86_64" ];
+      };
+    })
+  ];
+} }:
+
+(pkgs.buildFHSEnv {
+  name = "rider-fhs";
+  targetPkgs = pkgs: (with pkgs; [
+    jetbrains.rider
+    dotnetCorePackages.dotnet_8.sdk
+    mono
+    jdk17_headless
+    libx11 libice libsm libgbm skia fontconfig icu
+    android-tools
+    androidPkgs_34.androidsdk
+  ]);
+
+  runScript = ''
+    # Test
+    export SHELL=/bin/bash
+    export ANDROID_HOME=/usr/libexec/android-sdk
+    export PATH=$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools:$PATH
+    # Ensure Rider sees the correct .NET path in FHS
+    # export DOTNET_ROOT="${pkgs.dotnetCorePackages.dotnet_8.sdk}/share/dotnet"
+    rider .
+  '';
+}).env