M-Labs/nac3
M-Labs/nac3
8
1
Fork 12
Code Issues 98 Pull Requests 19 Releases Wiki Activity

Revert "flake: better shells"

Browse Source 
llvm-config/llvm-sys hates pkgs.buildEnv.

This reverts commit e4f35372d3.
This commit is contained in:
Sebastien Bourdeauducq 2021-12-05 14:35:27 +08:00
parent 9ee2168932
commit d2919b9620
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flake.nix
View File

@ -106,13 +106,9 @@
); );
}; };
# Use "nix develop" to debug the derivation. devShell.x86_64-linux = pkgs.mkShell {
devShell.x86_64-linux = packages.x86_64-linux.nac3artiq;
# Use "nix shell" to enter a development environment.
defaultPackage.x86_64-linux = pkgs.buildEnv {
name = "nac3-dev-shell"; name = "nac3-dev-shell";
paths = with pkgs; [ buildInputs = with pkgs; [
llvm_12 llvm_12
clang_12 clang_12
lld_12 lld_12
@ -129,7 +125,7 @@
hydraJobs = { hydraJobs = {
inherit (packages.x86_64-linux) nac3artiq; inherit (packages.x86_64-linux) nac3artiq;
nac3artiq-mingw = packages.x86_64-w64-mingw32.nac3artiq; nac3artiq-mingw = packages.x86_64-w64-mingw32.nac3artiq;
} // (pkgs.lib.foldr (a: b: {"${pkgs.lib.strings.getName a}" = a;} // b) {} defaultPackage.x86_64-linux.paths); } // (pkgs.lib.foldr (a: b: {"${pkgs.lib.strings.getName a}" = a;} // b) {} devShell.x86_64-linux.buildInputs);
}; };
nixConfig = { nixConfig = {