diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-08-15 20:57:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-15 20:57:35 -0500 |
| commit | 46c64da14e4b0ebbb10b880651c2c28c8f9a62ee (patch) | |
| tree | 56f622160d4d4febf822a9aa59287ce2be7e3ffa /pkgs/development/tools | |
| parent | 31a577c7362a6ac40e40897dd623c7ad829a81b4 (diff) | |
| parent | 0a8e68b1b57220fa02d512946408ef32afa241c7 (diff) | |
| download | nixpkgs-46c64da14e4b0ebbb10b880651c2c28c8f9a62ee.tar nixpkgs-46c64da14e4b0ebbb10b880651c2c28c8f9a62ee.tar.gz nixpkgs-46c64da14e4b0ebbb10b880651c2c28c8f9a62ee.tar.bz2 nixpkgs-46c64da14e4b0ebbb10b880651c2c28c8f9a62ee.tar.lz nixpkgs-46c64da14e4b0ebbb10b880651c2c28c8f9a62ee.tar.xz nixpkgs-46c64da14e4b0ebbb10b880651c2c28c8f9a62ee.tar.zst nixpkgs-46c64da14e4b0ebbb10b880651c2c28c8f9a62ee.zip | |
Merge pull request #66485 from xrelkd/update/cargo-expand
cargo-expand: 0.4.12 -> 0.4.13
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/rust/cargo-expand/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 32cd368fb04..0a36efa79eb 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,18 +1,22 @@ -{ stdenv, rustPlatform, fetchFromGitHub, darwin }: +{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.12"; + version = "0.4.13"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "0m57v7mh7wdl0rdbad7vkvcgy93p9gcb971wap8i5nzjvzmp4wlb"; + sha256 = "0s3xd9dr0n64j0m38gd4cafrdr5vnpl557ks4wr0jszyhldnlfkz"; }; - cargoSha256 = "1wvqxj2w02d6zhyw3z5v0w4bfmbmldh63ygmvfxa3ngfb36gcacz"; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + cargoSha256 = "13zz3n1p75267h3qrmvpmd8agnkbk8vfbr8s38wcyysck81pr4px"; + + buildInputs = [ llvmPackages.libclang ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; meta = with stdenv.lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; |