diff --git a/pkgs/development/compilers/rustc/1.0.0-beta.nix b/pkgs/development/compilers/rustc/1.0.0-beta.nix index 371f6195cd6d..93359fba9f7a 100644 --- a/pkgs/development/compilers/rustc/1.0.0-beta.nix +++ b/pkgs/development/compilers/rustc/1.0.0-beta.nix @@ -1,8 +1,8 @@ { stdenv, callPackage }: callPackage ./makeRustcDerivation.nix { - shortVersion = "1.0.0-beta"; + shortVersion = "1.0.0-beta.2"; isRelease = true; - srcSha = "94248e30487723ac6f6c34a0db5a21085c0b1338e6a32bd12b159e1d2cd80451"; + srcSha = "0wcpp6fg7cc75bj5b6dcz5dhgps6xw09n75qiapmd12qxjzj17wn"; snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec"; snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349"; snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234"; @@ -12,4 +12,5 @@ callPackage ./makeRustcDerivation.nix { patches = [ ./patches/beta.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; + configureFlags = [ "--release-channel=beta" ]; } diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/makeRustcDerivation.nix index 913e65de59aa..ae3981f1addc 100644 --- a/pkgs/development/compilers/rustc/makeRustcDerivation.nix +++ b/pkgs/development/compilers/rustc/makeRustcDerivation.nix @@ -6,6 +6,7 @@ , snapshotHashLinux686, snapshotHashLinux64 , snapshotHashDarwin686, snapshotHashDarwin64 , snapshotDate, snapshotRev +, configureFlags ? [] , patches }: @@ -113,7 +114,8 @@ stdenv.mkDerivation { '' else ""); }; - configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ] + configureFlags = configureFlags + ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" ] ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang"; inherit patches;