Skip to content

Commit

Permalink
[Chore] Fix overlay
Browse files Browse the repository at this point in the history
Problem: In my recent PR(#264), I accidentally picked overlay output
changes from the philtaken/nixos-vm-tests branch, which broke existing
overlay imports after updating the deployment-rs input.

Solution: Add backwards compatibility so that users don't have to make
changes to their nix flakes.
  • Loading branch information
Sereja313 committed Apr 1, 2024
1 parent 2bad218 commit f539b0f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ In the above configuration, `deploy-rs` is built from the flake, not from nixpkg
deployPkgs = import nixpkgs {
inherit system;
overlays = [
deploy-rs.overlay
deploy-rs.overlay # or deploy-rs.overlays.default
(self: super: { deploy-rs = { inherit (pkgs) deploy-rs; lib = super.deploy-rs.lib; }; })
];
};
Expand Down
5 changes: 3 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
};

outputs = { self, nixpkgs, utils, ... }@inputs:
{
overlays.default = final: prev: let
rec {
overlay = final: prev: let
system = final.stdenv.hostPlatform.system;
darwinOptions = final.lib.optionalAttrs final.stdenv.isDarwin {
buildInputs = with final.darwin.apple_sdk.frameworks; [
Expand Down Expand Up @@ -147,6 +147,7 @@
};
};
};
overlays.default = overlay;
} //
utils.lib.eachSystem (utils.lib.defaultSystems ++ ["aarch64-darwin"]) (system:
let
Expand Down

0 comments on commit f539b0f

Please sign in to comment.