public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #110383 from ck3d/fix-rust-bindgen

Browse Source 
rust-bindgen: Resolve "/usr/bin/env bash" to fix usage in Nix build
This commit is contained in:
Sandro 2021-01-22 02:16:08 +01:00 committed by GitHub
commit d78f0383c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/rust/bindgen/default.nix
View File

@ -1,5 +1,7 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin, { lib, stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin
runtimeShell }: , runtimeShell
, bash
}:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rust-bindgen"; pname = "rust-bindgen";
@ -16,7 +18,9 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1dv1ywdy701bnc2jv5jq0hnpal1snlizaj9w6k1wxyrp9szjd48w"; cargoSha256 = "1dv1ywdy701bnc2jv5jq0hnpal1snlizaj9w6k1wxyrp9szjd48w";
libclang = llvmPackages.libclang.lib; #for substituteAll #for substituteAll
libclang = llvmPackages.libclang.lib;
inherit bash;
buildInputs = [ libclang ]; buildInputs = [ libclang ];

2
pkgs/development/tools/rust/bindgen/wrapper.sh
View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!@bash@/bin/bash
sep='--' # whether to add -- before new options sep='--' # whether to add -- before new options
cxx=0 # whether cxx was explicitly requested cxx=0 # whether cxx was explicitly requested
lastWasx=0 # whether the last argument passed was -x lastWasx=0 # whether the last argument passed was -x