2
0
Fork 0

Add Clang to dev shell

This commit is contained in:
Ehmry - 2020-12-25 23:21:34 +01:00
parent a9d7d4d47e
commit a1d4c8f6d0
1 changed files with 38 additions and 34 deletions

View File

@ -82,7 +82,8 @@
devShell =
# Development shell for working with the
# upstream Genode source repositories
forAllLocalSystems (system:
let
devShell' = forAllSystems ({ system, localSystem, crossSystem }:
let
pkgs = nixpkgsFor.${system};
fhs = pkgs.buildFHSUserEnv {
@ -91,6 +92,7 @@
(with pkgs; [
binutils
bison
nixpkgsFor.${localSystem}.buildPackages.clang
expect
flex
git
@ -107,7 +109,8 @@
toolchain = pkgs.fetchzip {
url =
"file://${packages.x86_64-linux-x86_64-genode.genodeSources.toolchain.src}";
hash = "sha256-26rPvLUPEJm40zLSqTquwuFTJ1idTB0T4VXgaHRN+4o=";
hash =
"sha256-26rPvLUPEJm40zLSqTquwuFTJ1idTB0T4VXgaHRN+4o=";
};
in "ln -s ${toolchain}/local usr/local";
};
@ -116,6 +119,7 @@
nativeBuildInputs = [ fhs ];
shellHook = "exec genode-env";
});
in { x86_64-linux = devShell'.x86_64-linux-x86_64-genode; };
apps =
# Utilities accessible via "nix run"