diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-08 15:44:22 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-16 03:29:24 +0200 |
| commit | c37e1e2ff9238d80d98dd6633ff233fd0f5db5f3 (patch) | |
| tree | e425c0014722defdab64e4348854ae621e37d122 /pkgs/development/tools/misc | |
| parent | 3d251d06c2cda8480dda7952d45c9943c11de64c (diff) | |
| download | nixlib-c37e1e2ff9238d80d98dd6633ff233fd0f5db5f3.tar nixlib-c37e1e2ff9238d80d98dd6633ff233fd0f5db5f3.tar.gz nixlib-c37e1e2ff9238d80d98dd6633ff233fd0f5db5f3.tar.bz2 nixlib-c37e1e2ff9238d80d98dd6633ff233fd0f5db5f3.tar.lz nixlib-c37e1e2ff9238d80d98dd6633ff233fd0f5db5f3.tar.xz nixlib-c37e1e2ff9238d80d98dd6633ff233fd0f5db5f3.tar.zst nixlib-c37e1e2ff9238d80d98dd6633ff233fd0f5db5f3.zip | |
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.
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/lsof/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/lsof/dfile.patch | 18 |
2 files changed, 4 insertions, 25 deletions
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 224e0aba6ef7..8b89fd80c1a5 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -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; }; } diff --git a/pkgs/development/tools/misc/lsof/dfile.patch b/pkgs/development/tools/misc/lsof/dfile.patch deleted file mode 100644 index 47202d5ebeab..000000000000 --- a/pkgs/development/tools/misc/lsof/dfile.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- lsof_4.89_src/dialects/darwin/libproc/dfile.c 2014-10-30 12:39:46.000000000 +0100 -+++ lsof_4.89_src/dialects/darwin/libproc/dfile_new.c 2016-10-04 13:44:58.000000000 +0200 -@@ -286,13 +286,13 @@ - - #if defined(PROC_FP_GUARDED) - if (extra > 1) -- putchar(`,'); -+ putchar(','); - if (lf->guardflags) { - struct pff_tab *tp; - long gf; - - (void) printf("guard="); -- tp = Pgf_tab; -+ tp = Pff_tab; - gf = lf->guardflags; - while (gf && !FsvFlagX) { - while (tp->nm) { |