public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makeRustcDerivation: Add configurationFlags, rustcBeta: Add beta configuration flag

Browse Source
This commit is contained in:
Ryan Scheel (Havvy) 2015-04-21 20:48:29 +00:00
parent d3db093560
commit d29ef454f0
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/compilers/rustc/1.0.0-beta.nix
View File

@ -12,4 +12,5 @@ callPackage ./makeRustcDerivation.nix {
patches = [ patches = [
./patches/beta.patch ./patches/beta.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
configureFlags = [ "--release-channel=beta" ];
} }

4
pkgs/development/compilers/rustc/makeRustcDerivation.nix
View File

@ -6,6 +6,7 @@
, snapshotHashLinux686, snapshotHashLinux64 , snapshotHashLinux686, snapshotHashLinux64
, snapshotHashDarwin686, snapshotHashDarwin64 , snapshotHashDarwin686, snapshotHashDarwin64
, snapshotDate, snapshotRev , snapshotDate, snapshotRev
, configureFlags ? []
, patches , patches
}: }:
@ -113,7 +114,8 @@ stdenv.mkDerivation {
'' else ""); '' 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"; ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang";
inherit patches; inherit patches;