deprecate default.nix

This commit is contained in:
Wolfgang Thaller 2023-12-28 20:57:54 +01:00
parent db9c28db76
commit 504108a43a

View File

@ -1,10 +1,9 @@
let sources = import ./nix/sources.nix; let sources = import ./nix/sources.nix;
in { system ? builtins.currentSystem, nixpkgs ? sources.nixpkgs, in { system ? builtins.currentSystem, nixpkgs ? sources.nixpkgs
multiversal_src ? if builtins.pathExists ./multiversal/make-multiverse.rb then , multiversal_src ? if builtins.pathExists ./multiversal/make-multiverse.rb then
./multiversal ./multiversal
else else
sources.multiversal, sources.multiversal, ... }:
... }:
let let
retroPlatforms = import nix/platforms.nix; retroPlatforms = import nix/platforms.nix;
@ -30,8 +29,7 @@ let
crossSystem = plat; crossSystem = plat;
config = { allowUnsupportedSystem = true; }; config = { allowUnsupportedSystem = true; };
}) retroPlatforms; }) retroPlatforms;
targetPkgs = lib.mapAttrs (name: cross: targetPkgs = lib.mapAttrs (name: cross: cross.buildPackages) crossPkgs;
cross.buildPackages) crossPkgs;
shell = lib.mapAttrs (name: cross: shell = lib.mapAttrs (name: cross:
cross.mkShell { cross.mkShell {
@ -44,8 +42,10 @@ let
buildInputs = [ cross.retro68.console ]; buildInputs = [ cross.retro68.console ];
} // cross) crossPkgs; } // cross) crossPkgs;
in shell.m68k // shell // { in builtins.trace
"Warning: Retro68's default.nix is deprecated and will disappear soon. Please use the flake instead."
(shell.m68k // shell // {
inherit overlay; inherit overlay;
inherit (overlaidPkgs) retro68; inherit (overlaidPkgs) retro68;
targetPkg = targetPkgs; targetPkg = targetPkgs;
} })