aboutsummaryrefslogtreecommitdiff
path: root/src/nix/run.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-10-15 17:52:10 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-10-15 18:16:29 +0200
commit7d38060a0da2698052e84a0cfee422d409a38187 (patch)
treeb81347894cd8c8468e24d2262f4e226a48598575 /src/nix/run.cc
parent0bc8f1669d542ef65fbfa80ea3728f4dd36d63f2 (diff)
Support non-x86_64-linux system types in flakes
A command like $ nix run nixpkgs#hello will now build the attribute 'packages.${system}.hello' rather than 'packages.hello'. Note that this does mean that the flake needs to export an attribute for every system type it supports, and you can't build on unsupported systems. So 'packages' typically looks like this: packages = nixpkgs.lib.genAttrs ["x86_64-linux" "i686-linux"] (system: { hello = ...; }); The 'checks', 'defaultPackage', 'devShell', 'apps' and 'defaultApp' outputs similarly are now attrsets that map system types to derivations/apps. 'nix flake check' checks that the derivations for all platforms evaluate correctly, but only builds the derivations in 'checks.${system}'. Fixes #2861. (That issue also talks about access to ~/.config/nixpkgs and --arg, but I think it's reasonable to say that flakes shouldn't support those.) The alternative to attribute selection is to pass the system type as an argument to the flake's 'outputs' function, e.g. 'outputs = { self, nixpkgs, system }: ...'. However, that approach would be at odds with hermetic evaluation and make it impossible to enumerate the packages provided by a flake.
Diffstat (limited to 'src/nix/run.cc')
-rw-r--r--src/nix/run.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix/run.cc b/src/nix/run.cc
index 01ec9a6f8..d444fd2eb 100644
--- a/src/nix/run.cc
+++ b/src/nix/run.cc
@@ -215,12 +215,12 @@ struct CmdApp : InstallableCommand, RunCommon
Strings getDefaultFlakeAttrPaths() override
{
- return {"defaultApp"};
+ return {"defaultApp." + settings.thisSystem.get()};
}
Strings getDefaultFlakeAttrPathPrefixes() override
{
- return {"apps."};
+ return {"apps." + settings.thisSystem.get() + "."};
}
void run(ref<Store> store) override