Nix expr: make shellHook an output of default.nix, make shells directly within flake.nix

Author: SignalWalker

default.nix

@@ -150,9 +150,11 @@ in {
 			|| isVersionAtLeast "2.6" value.hawkSourceInfo.version))
 	];
 	latestVersionFrag = lib.head releaseFrags;
-	combined = pp // asmsFromReleaseArtifacts // releasesEmuHawkInstallables // {
-		inherit depsForHistoricalRelease populateHawkSourceInfo releaseTagSourceInfos;
-		inherit (emuhawk-local.assemblies) libretroCores;
+	combined = let
+		launchScriptsForLocalBuild = launchScriptsFor emuhawk-local.assemblies true;
+	in (pp // asmsFromReleaseArtifacts // releasesEmuHawkInstallables // {
+		inherit depsForHistoricalRelease populateHawkSourceInfo releaseTagSourceInfos launchScriptsForLocalBuild;
+		inherit (emuhawk-local.assemblies) libretroCores;		
 		bizhawkAssemblies = pp.buildAssembliesFor (fillTargetOSDifferences hawkSourceInfoDevBuild);
 		"bizhawkAssemblies-${latestVersionFrag}" = pp.buildAssembliesFor
 			(fillTargetOSDifferences releaseTagSourceInfos."info-${latestVersionFrag}");
@@ -172,8 +174,27 @@ in {
 		IDEs = {
 			kate = [ kate omnisharp-roslyn ];
 		};
-		launchScriptsForLocalBuild = launchScriptsFor emuhawk-local.assemblies true;
-	};
+		shellHook = drv: ''
+			export BIZHAWKBUILD_HOME='${builtins.toString ./.}'
+			export BIZHAWK_HOME="$BIZHAWKBUILD_HOME/output/"
+			ldLibPath='${lib.makeLibraryPath drv.buildInputs}' # for running tests
+			if [ -z "$LD_LIBRARY_PATH" ]; then
+				export LD_LIBRARY_PATH="$ldLibPath"
+			else
+				export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ldLibPath"
+			fi
+			alias discohawk-monort-local='${launchScriptsForLocalBuild.discohawk}'
+			alias emuhawk-monort-local='${launchScriptsForLocalBuild.emuhawk}'
+			case "$-" in *i*)
+				pfx="$(realpath --relative-to="$PWD" "$BIZHAWKBUILD_HOME")/"
+				if [ "$pfx" = "./" ]; then pfx=""; fi
+				printf "%s\n%s\n" \
+					"Run ''${pfx}Dist/Build{Debug,Release}.sh to build the solution. You may need to clean up with ''${pfx}Dist/CleanupBuildOutputDirs.sh." \
+					"Once built, running {discohawk,emuhawk}-monort-local will pull from ''${pfx}output/* and use Mono from Nixpkgs."
+				;;
+			esac
+		'';
+	});
 in combined // lib.listToAttrs (lib.concatLists (builtins.map
 	(f: [
 		{ name = f "latest-bin"; value = combined.${f "${latestVersionFrag}-bin"}; }

flake.nix

@@ -36,13 +36,38 @@
       ) nixpkgsFor;
       devShells = mapAttrs (
         system: pkgs:
-        # ./shell.nix outputs some non-derivation attributes and some extraneous derivations, so we have to filter those out
-        (lib.filterAttrs (
-          name: val: lib.isDerivation val && name != "stdenv" && name != "out" && name != "inputDerivation"
-        ) (import ./shell.nix { inherit system pkgs; }))
-        // {
-          default = self.devShells.${system}.emuhawk-latest;
-        }
+        let
+          avail = import ./default.nix { inherit system pkgs; };
+          mkShellCustom =
+            drv:
+            pkgs.mkShell {
+              packages = with pkgs; [
+                git
+                powershell
+              ];
+              inputsFrom = [ drv ];
+              shellHook = avail.shellHook drv;
+            };
+          shells = lib.pipe avail [
+            (lib.mapAttrs (
+              name: drv: if lib.hasPrefix "bizhawkAssemblies-" name then drv else drv.assemblies or null
+            ))
+            (lib.filterAttrs (_: drv: drv != null))
+            (lib.mapAttrs (
+              _: asms:
+              lib.traceIf (lib.hasSuffix "-bin" asms.name)
+                "the attr specified packages BizHawk from release artifacts; some builddeps may be missing from this shell"
+                mkShellCustom
+                asms
+            ))
+          ];
+        in
+        (
+          shells
+          // {
+            default = self.devShells.${system}.emuhawk-latest;
+          }
+        )
       ) nixpkgsFor;
     };
 }

shell.nix

@@ -25,26 +25,7 @@
 			++ lib.optionals useVSCode [] #TODO https://devblogs.microsoft.com/dotnet/csharp-dev-kit-now-generally-available/ https://learn.microsoft.com/en-us/training/modules/implement-visual-studio-code-debugging-tools/
 			;
 		inputsFrom = [ drv ];
-		shellHook = ''
-			export BIZHAWKBUILD_HOME='${builtins.toString ./.}'
-			export BIZHAWK_HOME="$BIZHAWKBUILD_HOME/output/"
-			ldLibPath='${lib.makeLibraryPath drv.buildInputs}' # for running tests
-			if [ -z "$LD_LIBRARY_PATH" ]; then
-				export LD_LIBRARY_PATH="$ldLibPath"
-			else
-				export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ldLibPath"
-			fi
-			alias discohawk-monort-local='${avail.launchScriptsForLocalBuild.discohawk}'
-			alias emuhawk-monort-local='${avail.launchScriptsForLocalBuild.emuhawk}'
-			case "$-" in *i*)
-				pfx="$(realpath --relative-to="$PWD" "$BIZHAWKBUILD_HOME")/"
-				if [ "$pfx" = "./" ]; then pfx=""; fi
-				printf "%s\n%s\n" \
-					"Run ''${pfx}Dist/Build{Debug,Release}.sh to build the solution. You may need to clean up with ''${pfx}Dist/CleanupBuildOutputDirs.sh." \
-					"Once built, running {discohawk,emuhawk}-monort-local will pull from ''${pfx}output/* and use Mono from Nixpkgs."
-				;;
-			esac
-		'';
+		shellHook = avail.shellHook drv;
 	};
 	shells = lib.pipe avail [
 		(lib.mapAttrs (name: drv: if lib.hasPrefix "bizhawkAssemblies-" name then drv else drv.assemblies or null))