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

rustc: Use fetchzip in src attr instead of fetchurl

Browse Source 
Otherwise, `RUST_SRC_PATH` in `racerRust` will point to an invalid path
(such as `/nix/store/xxx-rustc-1.0.0.tar.gz/src`, where
`rustc-1.0.0.tar.gz` is a real tarball file).
This commit is contained in:
Ricardo M. Correia 2015-05-27 01:18:30 +02:00
parent dda255f938
commit 4e4d01af81
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/rustc/1.0.0.nix
View File

@ -2,7 +2,7 @@
callPackage ./makeRustcDerivation.nix {
shortVersion = "1.0.0";
isRelease = true;
srcSha = "1fjyk5xhg9dx85d1kkjmb1jai7awvdmzcjf2fdmi2pdjyzacn163";
srcSha = "14brziw91d3r88fa1kvpvhap5ws4z8h2mas7h6k9lpsc2zl9blak";
snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec";
snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349";
snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234";

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper
, tzdata, git, valgrind, procps, coreutils
{ stdenv, fetchurl, fetchgit, fetchzip, which, file, perl, curl, python27
, makeWrapper, tzdata, git, valgrind, procps, coreutils
, shortVersion, isRelease
, srcSha, srcRev ? ""
@ -85,7 +85,7 @@ stdenv.mkDerivation {
inherit meta;
src = if isRelease then
fetchurl {
fetchzip {
url = "http://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
sha256 = srcSha;
}