From da3da08cdf3c622bf14a14a70f5da0e6655779d3 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 14 Aug 2019 09:50:05 +0000 Subject: [PATCH] buildRustPackage: link against pthreads-w32 on x86_64-pc-mingw32 --- pkgs/build-support/rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index e354bd6710d4d7..49adcb4d301dd1 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cacert, git, cargo, rustc, fetchcargo, buildPackages }: +{ stdenv, cacert, git, cargo, rustc, fetchcargo, buildPackages, windows }: { name ? "${args.pname}-${args.version}" , cargoSha256 ? "unset" @@ -59,8 +59,8 @@ stdenv.mkDerivation (args // { patchRegistryDeps = ./patch-registry-deps; - nativeBuildInputs = [ cargo rustc git cacert ] ++ nativeBuildInputs; - inherit buildInputs; + nativeBuildInputs = nativeBuildInputs ++ [ cacert git cargo rustc ]; + buildInputs = buildInputs ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.pthreads; patches = cargoPatches ++ patches;