diff options
| author | Benjamin Saunders <ben.e.saunders@gmail.com> | 2017-05-04 22:17:56 -0700 |
|---|---|---|
| committer | Benjamin Saunders <ben.e.saunders@gmail.com> | 2017-05-04 23:20:51 -0700 |
| commit | bbdfa06eb5b0bea96bb287eacfee5c720e4cade6 (patch) | |
| tree | 97cc739f0518ce96ac4fdfe31f6ebeb5da77fc5b /pkgs/development/tools/rust/bindgen | |
| parent | 244b05e5e5ada2a9d16a2b0a49167d52cea1ed3f (diff) | |
| download | nixlib-bbdfa06eb5b0bea96bb287eacfee5c720e4cade6.tar nixlib-bbdfa06eb5b0bea96bb287eacfee5c720e4cade6.tar.gz nixlib-bbdfa06eb5b0bea96bb287eacfee5c720e4cade6.tar.bz2 nixlib-bbdfa06eb5b0bea96bb287eacfee5c720e4cade6.tar.lz nixlib-bbdfa06eb5b0bea96bb287eacfee5c720e4cade6.tar.xz nixlib-bbdfa06eb5b0bea96bb287eacfee5c720e4cade6.tar.zst nixlib-bbdfa06eb5b0bea96bb287eacfee5c720e4cade6.zip | |
rust-bindgen: 0.23.0 -> 0.24.0
Fixes errors arising from unset LIBCLANG_PATH
Diffstat (limited to 'pkgs/development/tools/rust/bindgen')
| -rw-r--r-- | pkgs/development/tools/rust/bindgen/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 4a4738e069c6..79c400fd3340 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,25 +1,30 @@ -{ stdenv, fetchFromGitHub, rustPlatform, llvmPackages }: +{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, llvmPackages }: # Future work: Automatically communicate NIX_CFLAGS_COMPILE to bindgen's tests and the bindgen executable itself. rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "servo"; repo = "rust-bindgen"; rev = "v${version}"; - sha256 = "1cr7wgb13pavjpv2glq02wf5sqigcl1k0qgf3cqi9c5mjca2cg5y"; + sha256 = "1nzva8g5nj7m2w8vax86p4rd02ci8793nhnm7sf76ajr4hfnx323"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ llvmPackages.clang-unwrapped ]; configurePhase = '' export LIBCLANG_PATH="${llvmPackages.clang-unwrapped}/lib" ''; - depsSha256 = "1qrnd9a73vxr7572byjjlhwbax3z4slc7qmwjx3aiwjix3r250dh"; + postInstall = '' + wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib" + ''; + + depsSha256 = "1l8c48y67azzwmv4hzghia1c53b5dw6qiv22cgv8zbyrg20aj8as"; doCheck = false; # A test fails because it can't find standard headers in NixOS |