diff --git a/default.nix b/default.nix
index a8a1da02..f98904da 100644
--- a/default.nix
+++ b/default.nix
@@ -21,8 +21,8 @@ let
         pkgs.gnumake
         (pkgs.python3.withPackages(ps: (with artiqpkgs; [ migen migen-axi misoc artiq ])))
         pkgs.cargo-xbuild
-        pkgs.llvm_9
-        pkgs.clang_9
+        pkgs.llvmPackages_9.llvm
+        pkgs.llvmPackages_9.clang-unwrapped
       ];
       buildPhase = ''
         export XARGO_RUST_SRC="${rustPlatform.rust.rustc.src}/src"
diff --git a/shell.nix b/shell.nix
index 56f255ed..01679e1b 100644
--- a/shell.nix
+++ b/shell.nix
@@ -12,8 +12,8 @@ in
       pkgs.gnumake
       rustPlatform.rust.rustc
       rustPlatform.rust.cargo
-      pkgs.llvm_9
-      pkgs.clang_9
+      pkgs.llvmPackages_9.llvm
+      pkgs.llvmPackages_9.clang-unwrapped
       pkgs.cacert
       pkgs.cargo-xbuild