Merge pull request #117348 from zseri/unbuild
This commit is contained in:
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ fping libowlevelzs net-snmp ];
|
||||
buildInputs = [ libowlevelzs net-snmp ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/confent.cxx \
|
||||
--replace /usr/sbin/fping "${lib.makeBinPath [fping]}/fping"
|
||||
--replace /usr/sbin/fping "${fping}/bin/fping"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ bash, coreutils, fetchurl, fping, lib, stdenvNoCC }:
|
||||
{ coreutils, fetchurl, fping, lib, stdenvNoCC }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "zs-wait4host";
|
||||
@@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
sha256 = "9F1264BDoGlRR7bWlRXhfyvxWio4ydShKmabUQEIz9I=";
|
||||
};
|
||||
|
||||
buildInputs = [ bash coreutils fping ];
|
||||
|
||||
postPatch = ''
|
||||
for i in zs-wait4host zs-wait4host-inf; do
|
||||
substituteInPlace "$i" \
|
||||
|
||||
Reference in New Issue
Block a user