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

rustNightlyBin: 2017-01-26 -> 2017-03-16 (#23988)

Browse Source 
thanks!
This commit is contained in:
Jörg Thalheim 2017-03-17 14:51:28 +01:00 committed by Joachim Schiele
parent 8388cb8bff
commit 273e480379
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/rust/nightlyBin.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage }: { stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl }:
let let
inherit (stdenv.lib) optionalString; inherit (stdenv.lib) optionalString;
@ -9,7 +9,7 @@ let
bootstrapHash = bootstrapHash =
if stdenv.system == "x86_64-linux" if stdenv.system == "x86_64-linux"
then "1v7jvwigb29m15wilzcrk5jmlpaccpzbkhlzf7z5qw08320gvc91" then "1d5h34dkm1r1ff562szygn9xk2qll1pjryvypl0lazzanxdh5gv5"
else throw "missing bootstrap hash for platform ${stdenv.system}"; else throw "missing bootstrap hash for platform ${stdenv.system}";
needsPatchelf = stdenv.isLinux; needsPatchelf = stdenv.isLinux;
@ -19,7 +19,7 @@ let
sha256 = bootstrapHash; sha256 = bootstrapHash;
}; };
version = "2017-01-26"; version = "2017-03-16";
in in
rec { rec {
@ -69,7 +69,7 @@ rec {
license = [ licenses.mit licenses.asl20 ]; license = [ licenses.mit licenses.asl20 ];
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper curl ];
phases = ["unpackPhase" "installPhase"]; phases = ["unpackPhase" "installPhase"];
installPhase = '' installPhase = ''
@ -78,6 +78,7 @@ rec {
${optionalString needsPatchelf '' ${optionalString needsPatchelf ''
patchelf \ patchelf \
--set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/bin/cargo" "$out/bin/cargo"
''} ''}