diff options
| author | Léo Gaspard <leo@gaspard.io> | 2018-08-13 14:44:30 +0900 |
|---|---|---|
| committer | Léo Gaspard <leo@gaspard.io> | 2018-08-13 14:44:30 +0900 |
| commit | b6e881ab72fbd0bb50b58668b457f7a79ceb8993 (patch) | |
| tree | fcd4ccf3119a4f71f975d673568f643fbca33544 /pkgs/build-support | |
| parent | f8e8ecde51b49132d7f8d5adb971c0e37eddcdc2 (diff) | |
| download | nixlib-b6e881ab72fbd0bb50b58668b457f7a79ceb8993.tar nixlib-b6e881ab72fbd0bb50b58668b457f7a79ceb8993.tar.gz nixlib-b6e881ab72fbd0bb50b58668b457f7a79ceb8993.tar.bz2 nixlib-b6e881ab72fbd0bb50b58668b457f7a79ceb8993.tar.lz nixlib-b6e881ab72fbd0bb50b58668b457f7a79ceb8993.tar.xz nixlib-b6e881ab72fbd0bb50b58668b457f7a79ceb8993.tar.zst nixlib-b6e881ab72fbd0bb50b58668b457f7a79ceb8993.zip | |
buildRustPackage: allow patches to fix Cargo.lock
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/rust/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/build-support/rust/fetchcargo.nix | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index fb1d6e390ae1..8265fff2c61c 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -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; diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 42a3ac27cb5b..2670ed528640 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -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 |