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

Merge pull request #58047 from illegalprime/libndctl-cross

Browse Source 
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
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libndctl/default.nix
View File

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