lsof: 4.89 -> 4.90
- The patch has been applied upstream. - LSOF_INCLUDE was referring to wrong output, this broke the build. - Remove an unneeded legacy sed. - Maintain, while at it.
This commit is contained in:
@@ -4,7 +4,7 @@ let dialect = with stdenv.lib; last (splitString "-" stdenv.system); in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lsof-${version}";
|
||||
version = "4.89";
|
||||
version = "4.90";
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
buildInputs = [ ncurses ];
|
||||
@@ -23,22 +23,19 @@ stdenv.mkDerivation rec {
|
||||
+ "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2"
|
||||
) [ false true ]
|
||||
;
|
||||
sha256 = "061p18v0mhzq517791xkjs8a5dfynq1418a1mwxpji69zp2jzb41";
|
||||
sha256 = "1xhn3amvl5mmwji5g90nkw7lfmh2494v18qbv1f729hrg468853g";
|
||||
};
|
||||
|
||||
unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";
|
||||
|
||||
patches = [ ./dfile.patch ];
|
||||
|
||||
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1
|
||||
'';
|
||||
|
||||
# Stop build scripts from searching global include paths
|
||||
LSOF_INCLUDE = "${stdenv.cc.libc}/include";
|
||||
LSOF_INCLUDE = "${stdenv.cc.libc.dev}/include";
|
||||
configurePhase = "LINUX_CONF_CC=$CC_FOR_BUILD LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB ./Configure -n ${dialect}";
|
||||
preBuild = ''
|
||||
sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;' -e 's/-lcurses/-lncurses/'
|
||||
for filepath in $(find dialects/${dialect} -type f); do
|
||||
sed -i "s,/usr/include,$LSOF_INCLUDE,g" $filepath
|
||||
done
|
||||
@@ -58,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
socket (IPv6/IPv4/UNIX local), or partition (by opening a file
|
||||
from it).
|
||||
'';
|
||||
maintainers = [ ];
|
||||
maintainers = [ stdenv.lib.maintainers.dezgeg ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user