Merge pull request #58047 from illegalprime/libndctl-cross

libndctl: use buildPackages.which
This commit is contained in:
Matthew Bauer 2019-03-25 22:01:00 -04:00 committed by GitHub
commit 1ca86b4056
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs =
[ autoreconfHook asciidoctor pkgconfig xmlto docbook_xml_dtd_45 docbook_xsl libxslt
which
];
buildInputs =
@ -31,7 +32,6 @@ stdenv.mkDerivation rec {
patchPhase = ''
patchShebangs test
substituteInPlace configure.ac --replace "which" "${which}/bin/which"
substituteInPlace git-version --replace /bin/bash ${stdenv.shell}
substituteInPlace git-version-gen --replace /bin/sh ${stdenv.shell}