Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-04-16 18:13:19 +00:00
committed by GitHub
34 changed files with 2046 additions and 1365 deletions
+7 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenvNoCC, fetchFromGitHub, bash }:
{ lib, stdenvNoCC, fetchFromGitHub, bash, makeWrapper, pciutils }:
stdenvNoCC.mkDerivation rec {
pname = "neofetch";
@@ -13,10 +13,16 @@ stdenvNoCC.mkDerivation rec {
strictDeps = true;
buildInputs = [ bash ];
nativeBuildInputs = [ makeWrapper ];
postPatch = ''
patchShebangs --host neofetch
'';
postInstall = ''
wrapProgram $out/bin/neofetch \
--prefix PATH : ${lib.makeBinPath [ pciutils ]}
'';
makeFlags = [
"PREFIX=${placeholder "out"}"
"SYSCONFDIR=${placeholder "out"}/etc"