Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

nix: add rust-src component to rust toolchain

Browse Source
This commit is contained in:
Justus K 2020-12-02 12:48:14 +01:00
parent d1431d734a
commit a0ca0c1517
No known key found for this signature in database
GPG Key ID: 8C62FE98A62FC462
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nix/common.nix
View File

@ -3,10 +3,19 @@ let
mozPkgs = import "${sources.nixpkgsMoz}/package-set.nix" {
pkgs = import nixpkgs { inherit system; };
};
rustChannel = mozPkgs.rustChannelOf {
rustToolchain = ../rust-toolchain;
sha256 = "sha256-P4FTKRe0nM1FRDV0Q+QY2WcC8M9IR7aPMMLWDfv+rEk=";
};
rustChannel = let
channel = mozPkgs.rustChannelOf {
rustToolchain = ../rust-toolchain;
sha256 = "sha256-P4FTKRe0nM1FRDV0Q+QY2WcC8M9IR7aPMMLWDfv+rEk=";
};
flip = f: a: b: f b a;
mapAttrs = builtins.mapAttrs;
in flip mapAttrs channel (name: value:
(if name == "rust" then
value.override { extensions = [ "rust-src" ]; }
else
value));
pkgs = import nixpkgs {
inherit system;
@ -14,14 +23,13 @@ let
(final: prev: {
rustc = rustChannel.rust;
inherit (rustChannel)
;
;
crate2nix = prev.callPackage sources.crate2nix { pkgs = prev; };
nixGL = prev.callPackage sources.nixGL { pkgs = prev; };
})
];
};
in
with pkgs;
in with pkgs;
let
# deps that crates need (for compiling)
crateDeps = {
@ -48,5 +56,4 @@ let
++ [ libGL ];
gitLfsCheckFile = ../assets/voxygen/background/bg_main.png;
in
{ inherit pkgs voxygenNeededLibs crateDeps gitLfsCheckFile; }
in { inherit pkgs voxygenNeededLibs crateDeps gitLfsCheckFile; }