devShells.x86_64-darwin: Remove unsupported non-native shells

See NixOS/nixpkgs#180771
NixOS · Feb 27, 2024 · 1fdd1c6 · 1fdd1c6
1 parent 6d25f92
commit 1fdd1c6
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/flake.nix b/flake.nix
@@ -415,13 +415,22 @@
               lib.mapAttrs'
               (k: v: lib.nameValuePair "${prefix}-${k}" v)
               (forAllStdenvs (stdenvName: makeShell pkgs pkgs.${stdenvName}));
+
+            hasCross =
+              # error: don't yet have a `targetPackages.darwin.LibsystemCross for x86_64-apple-darwin`
+              #        see https://github.com/NixOS/nixpkgs/issues/180771
+              system != "x86_64-darwin";
+
+            nativeShells = makeShells "native" nixpkgsFor.${system}.native;
           in
-            (makeShells "native" nixpkgsFor.${system}.native) //
-            (makeShells "static" nixpkgsFor.${system}.static) //
-            (lib.genAttrs shellCrossSystems (crossSystem: let pkgs = nixpkgsFor.${system}.cross.${crossSystem}; in makeShell pkgs pkgs.stdenv)) //
             {
-              default = self.devShells.${system}.native-stdenvPackages;
+              default = nativeShells.native-stdenvPackages;
             }
+            // nativeShells
+            // lib.optionalAttrs hasCross (
+              lib.genAttrs shellCrossSystems (crossSystem: let pkgs = nixpkgsFor.${system}.cross.${crossSystem}; in makeShell pkgs pkgs.stdenv)
+              // makeShells "static" nixpkgsFor.${system}.static
+            )
         );
   };
 }