Skip to content

Commit

Permalink
Make nix flake show --all-systems work (#91)
Browse files Browse the repository at this point in the history
Before this patch we get:

  error: don't yet have a `targetPackages.darwin.LibsystemCross for x86_64-apple-darwin`
  • Loading branch information
grahamc authored Oct 25, 2023
1 parent b43d120 commit e9918bc
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@

attic-nixpkgs = pkgs.callPackage ./package.nix { };

attic-ci-installer = pkgs.callPackage ./ci-installer.nix {
inherit self;
};

book = pkgs.callPackage ./book {
attic = packages.attic;
};
} // (lib.optionalAttrs (system != "x86_64-darwin") {
# Unfortunately, x86_64-darwin fails to evaluate static builds
# TODO: Make this work with Crane
attic-static = (pkgs.pkgsStatic.callPackage ./package.nix {
nix = pkgs.pkgsStatic.nix.overrideAttrs (old: {
Expand Down Expand Up @@ -78,15 +87,7 @@
attic-client-static = packages.attic-static.override {
clientOnly = true;
};

attic-ci-installer = pkgs.callPackage ./ci-installer.nix {
inherit self;
};

book = pkgs.callPackage ./book {
attic = packages.attic;
};
} // (lib.optionalAttrs pkgs.stdenv.isLinux {
}) // (lib.optionalAttrs pkgs.stdenv.isLinux {
attic-server-image = pkgs.dockerTools.buildImage {
name = "attic-server";
tag = "main";
Expand Down

0 comments on commit e9918bc

Please sign in to comment.