diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-08-13 12:22:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-13 12:22:59 +0200 |
| commit | 3dc78e6ae9a1143131d4d735094af22fae9d2fa8 (patch) | |
| tree | 2339f8d288d14dbb14f8116d38ec1b5cc008679c /pkgs/build-support | |
| parent | 6afd19e699c1505938d54312b522562fd75c8062 (diff) | |
| parent | b6e881ab72fbd0bb50b58668b457f7a79ceb8993 (diff) | |
| download | nixpkgs-3dc78e6ae9a1143131d4d735094af22fae9d2fa8.tar nixpkgs-3dc78e6ae9a1143131d4d735094af22fae9d2fa8.tar.gz nixpkgs-3dc78e6ae9a1143131d4d735094af22fae9d2fa8.tar.bz2 nixpkgs-3dc78e6ae9a1143131d4d735094af22fae9d2fa8.tar.lz nixpkgs-3dc78e6ae9a1143131d4d735094af22fae9d2fa8.tar.xz nixpkgs-3dc78e6ae9a1143131d4d735094af22fae9d2fa8.tar.zst nixpkgs-3dc78e6ae9a1143131d4d735094af22fae9d2fa8.zip | |
Merge pull request #44967 from Ekleog/rust-patch
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 fb1d6e390ae..8265fff2c61 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 42a3ac27cb5..2670ed52864 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 |