diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-10-08 21:59:26 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-10-08 22:56:23 +0200 |
| commit | 1eff910a15c58873fc9bbb46934ba354bef612a3 (patch) | |
| tree | d92e3a3860ff8e31e744fcae3a1d10e0a943a5c0 /pkgs | |
| parent | a3382a85b38227f9c82ce325150c57250c9514bb (diff) | |
| download | nixpkgs-1eff910a15c58873fc9bbb46934ba354bef612a3.tar nixpkgs-1eff910a15c58873fc9bbb46934ba354bef612a3.tar.gz nixpkgs-1eff910a15c58873fc9bbb46934ba354bef612a3.tar.bz2 nixpkgs-1eff910a15c58873fc9bbb46934ba354bef612a3.tar.lz nixpkgs-1eff910a15c58873fc9bbb46934ba354bef612a3.tar.xz nixpkgs-1eff910a15c58873fc9bbb46934ba354bef612a3.tar.zst nixpkgs-1eff910a15c58873fc9bbb46934ba354bef612a3.zip | |
lsof: Don't record compiler flags / build kernel
This removed glibc.dev from the closure and improves binary reproducibility.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/lsof/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/lsof/no-build-info.patch | 43 |
2 files changed, 44 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 0a5a3c48781..63003f338eb 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch; + patches = [ ./no-build-info.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1 diff --git a/pkgs/development/tools/misc/lsof/no-build-info.patch b/pkgs/development/tools/misc/lsof/no-build-info.patch new file mode 100644 index 00000000000..cf785e248f2 --- /dev/null +++ b/pkgs/development/tools/misc/lsof/no-build-info.patch @@ -0,0 +1,43 @@ +diff -ru -x '*~' lsof_4.91_src-orig/usage.c lsof_4.91_src/usage.c +--- lsof_4.91_src-orig/usage.c 2018-02-14 15:20:32.000000000 +0100 ++++ lsof_4.91_src/usage.c 2018-10-08 21:57:45.718560869 +0200 +@@ -930,26 +930,6 @@ + (void) fprintf(stderr, " configuration info: %s\n", cp); + #endif /* defined(LSOF_CINFO) */ + +- if ((cp = isnullstr(LSOF_CCDATE))) +- (void) fprintf(stderr, " constructed: %s\n", cp); +- cp = isnullstr(LSOF_HOST); +- if (!(cp1 = isnullstr(LSOF_LOGNAME))) +- cp1 = isnullstr(LSOF_USER); +- if (cp || cp1) { +- if (cp && cp1) +- cp2 = "by and on"; +- else if (cp) +- cp2 = "on"; +- else +- cp2 = "by"; +- (void) fprintf(stderr, " constructed %s: %s%s%s\n", +- cp2, +- cp1 ? cp1 : "", +- (cp && cp1) ? "@" : "", +- cp ? cp : "" +- ); +- } +- + #if defined(LSOF_BLDCMT) + if ((cp = isnullstr(LSOF_BLDCMT))) + (void) fprintf(stderr, " builder's comment: %s\n", cp); +@@ -959,12 +939,8 @@ + (void) fprintf(stderr, " compiler: %s\n", cp); + if ((cp = isnullstr(LSOF_CCV))) + (void) fprintf(stderr, " compiler version: %s\n", cp); +- if ((cp = isnullstr(LSOF_CCFLAGS))) +- (void) fprintf(stderr, " compiler flags: %s\n", cp); + if ((cp = isnullstr(LSOF_LDFLAGS))) + (void) fprintf(stderr, " loader flags: %s\n", cp); +- if ((cp = isnullstr(LSOF_SYSINFO))) +- (void) fprintf(stderr, " system info: %s\n", cp); + (void) report_SECURITY(" ", ".\n"); + (void) report_WARNDEVACCESS(" ", "are", ".\n"); + (void) report_HASKERNIDCK(" K", "is"); |