xbuild -> cargo-xbuild

cargo-xbuild.nix

@@ -10,7 +10,7 @@ pkgs.rustPlatform.buildRustPackage rec {
     sha256 = "08mpnj3l6bcm1jg22lw1gcs0lkm4320fwl4p5y1s44w64963kzf7";
   };
 
-  patches = [./xbuild.patch];
+  patches = [ ./cargo-xbuild.patch ];
 
   cargoSha256 = "1pj4x8y5vfpnn8vhxqqm3vicn29870r3jh0b17q3riq4vz1a2afp";
 

shell.nix

@@ -5,7 +5,7 @@ let
   rustPlatform = (import ./rustPlatform.nix { inherit pkgs; });
   artiqpkgs = import "${artiq-fast}/default.nix" { inherit pkgs; };
   vivado = import "${artiq-fast}/vivado.nix" { inherit pkgs; };
-  xbuild = import ./xbuild.nix { inherit pkgs; };
+  cargo-xbuild = import ./cargo-xbuild.nix { inherit pkgs; };
 in
   pkgs.stdenv.mkDerivation {
     name = "artiq-zynq-env";
@@ -16,7 +16,7 @@ in
       pkgs.llvmPackages_9.llvm
       pkgs.llvmPackages_9.clang-unwrapped
       pkgs.cacert
-      xbuild
+      cargo-xbuild
 
       pkgs.openocd
       pkgs.openssh pkgs.rsync