nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 18:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove rust=rustc alias

Browse Source 
I was asked to add this for backwards comparability when I renamed `rust`
to `rustc` and added `rustcMaster`. It has been a few months so I'd hope
deprecating this is acceptable.
This commit is contained in:
John Ericson 2015-01-11 17:33:58 +00:00
parent 0a80cf9e51
commit 81bc099d48
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/rust/racer/default.nix
View File

@ -1,8 +1,4 @@
{stdenv, fetchgit, rust, makeWrapper }: {stdenv, fetchgit, rustc, makeWrapper }:
let
rustSrc = rust.src;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
#TODO add emacs support #TODO add emacs support
@ -13,16 +9,16 @@ stdenv.mkDerivation rec {
sha256 = "1159fsfca2kqvlajp8sawrskip7hc0rppk8vhwxa2vw8zznp56w0"; sha256 = "1159fsfca2kqvlajp8sawrskip7hc0rppk8vhwxa2vw8zznp56w0";
}; };
buildInputs = [ rust makeWrapper ]; buildInputs = [ rustc makeWrapper ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp -p bin/racer $out/bin/ cp -p bin/racer $out/bin/
wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustSrc}/src" wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustc.src}/src"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A utility intended to provide rust code completion for editors and IDEs."; description = "A utility intended to provide Rust code completion for editors and IDEs.";
homepage = https://github.com/phildawes/racer; homepage = https://github.com/phildawes/racer;
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
maintainers = [ maintainers.jagajaga ]; maintainers = [ maintainers.jagajaga ];

4
pkgs/top-level/all-packages.nix
View File

@ -3939,8 +3939,6 @@ let
rustc = callPackage ../development/compilers/rustc/0.12.nix {}; rustc = callPackage ../development/compilers/rustc/0.12.nix {};
rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
rust = rustc;
sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
sbcl = callPackage ../development/compilers/sbcl { sbcl = callPackage ../development/compilers/sbcl {
@ -4772,7 +4770,7 @@ let
premake = premake4; premake = premake4;
racerRust = callPackage ../development/tools/rust/racer { rust = rustcMaster; }; racerRust = callPackage ../development/tools/rust/racer { rustc = rustcMaster; };
radare = callPackage ../development/tools/analysis/radare { radare = callPackage ../development/tools/analysis/radare {
inherit (gnome) vte; inherit (gnome) vte;