diff --git a/flake.nix b/flake.nix
index 320a659..5a32ff0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -85,14 +85,15 @@
         let
           devShell' = forAllSystems ({ system, localSystem, crossSystem }:
             let
-              pkgs = nixpkgsFor.${system};
+              pkgs = nixpkgsFor.${localSystem};
               fhs = pkgs.buildFHSUserEnv {
                 name = "genode-env";
                 targetPkgs = pkgs:
                   (with pkgs; [
                     binutils
                     bison
-                    nixpkgsFor.${localSystem}.buildPackages.clang
+                    nixpkgsFor.${system}.buildPackages.clang
+                    self.legacyPackages.${localSystem}.llvmPackages_7.bintools
                     expect
                     flex
                     git