alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #44967 from Ekleog/rust-patch

Browse source 
buildRustPackage: allow patches to fix Cargo.lock
This commit is contained in:
Jörg Thalheim 2018-08-13 12:22:59 +02:00 committed by GitHub
parent 6afd19e699 b6e881ab72
commit 3dc78e6ae9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/build-support/rust/default.nix
View file

@ -7,6 +7,7 @@ in
{ name, cargoSha256 ? "unset"
, src ? null
, srcs ? null
, patches ? []
, sourceRoot ? null
, logLevel ? ""
, buildInputs ? []
@ -22,7 +23,7 @@ assert cargoVendorDir == null -> cargoSha256 != "unset";
let
cargoDeps = if cargoVendorDir == null
then fetchcargo {
inherit name src srcs sourceRoot cargoUpdateHook;
inherit name src srcs patches sourceRoot cargoUpdateHook;
sha256 = cargoSha256;
}
else null;

6
pkgs/build-support/rust/fetchcargo.nix
View file

@ -1,11 +1,11 @@
{ stdenv, cacert, git, rust, cargo-vendor }:
{ name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }:
{ name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "" }:
stdenv.mkDerivation {
name = "${name}-vendor";
nativeBuildInputs = [ cacert cargo-vendor git rust.cargo ];
inherit src srcs sourceRoot;
inherit src srcs patches sourceRoot;
phases = "unpackPhase installPhase";
phases = "unpackPhase patchPhase installPhase";
installPhase = ''
if [[ ! -f Cargo.lock ]]; then