JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #181553 from jiegec/lsof

Browse Source 
lsof: fix -fno-common builds on darwin
This commit is contained in:
K900 2022-07-15 08:29:40 +03:00 committed by GitHub
commit 5946c56920
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/tools/misc/lsof/default.nix
View File

@ -18,6 +18,20 @@ stdenv.mkDerivation rec {
patches = [
./no-build-info.patch
# Pull upstream fix for -fno-common toolchains:
# https://github.com/lsof-org/lsof/pull/226
# https://github.com/lsof-org/lsof/pull/233
(fetchpatch {
name = "add-extern.patch";
url = "https://github.com/lsof-org/lsof/commit/180ffa29b0544f77cabbc54d7f77d50d33dd27d7.patch";
sha256 = "sha256-zzcN9HrFYMTBeEekeAwi2RIcVukymgaqtpvFIBV6njU=";
})
(fetchpatch {
name = "add-declaration.patch";
url = "https://github.com/lsof-org/lsof/commit/8e47e1491636e8cf41baf834554391be45177b00.patch";
sha256 = "sha256-kwkDQp7VApLenOLTPMY24Me+/xUhD56skHWRd4ZB1I4=";
})
];
postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''