diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-10-25 21:15:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-25 21:15:32 -0500 |
| commit | 77ed358e3d7945116cd0641d10928b5ee14c4db1 (patch) | |
| tree | c2dffb6be54f389104acf3b0a74819a032ceefbc | |
| parent | 8055e6795ec6cad88f2f95b0cd29ef1c9fbeac4f (diff) | |
| parent | 80da54afc13733eeae58982c16a1335978f59659 (diff) | |
| download | nixlib-77ed358e3d7945116cd0641d10928b5ee14c4db1.tar nixlib-77ed358e3d7945116cd0641d10928b5ee14c4db1.tar.gz nixlib-77ed358e3d7945116cd0641d10928b5ee14c4db1.tar.bz2 nixlib-77ed358e3d7945116cd0641d10928b5ee14c4db1.tar.lz nixlib-77ed358e3d7945116cd0641d10928b5ee14c4db1.tar.xz nixlib-77ed358e3d7945116cd0641d10928b5ee14c4db1.tar.zst nixlib-77ed358e3d7945116cd0641d10928b5ee14c4db1.zip | |
Merge pull request #261118 from trofi/cowpatty-parallel-fix
cowpatty: backport parallel build fix
| -rw-r--r-- | pkgs/tools/security/cowpatty/default.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/tools/security/cowpatty/default.nix b/pkgs/tools/security/cowpatty/default.nix index 934b31a35da6..2c6e0cfa414f 100644 --- a/pkgs/tools/security/cowpatty/default.nix +++ b/pkgs/tools/security/cowpatty/default.nix @@ -2,6 +2,7 @@ , stdenv , clang , fetchFromGitHub +, fetchpatch , installShellFiles , openssl , libpcap @@ -18,6 +19,16 @@ stdenv.mkDerivation rec { sha256 = "0fvwwghhd7wsx0lw2dj9rdsjnirawnq3c6silzvhi0yfnzn5fs0s"; }; + patches = [ + # Pull upstream fix for parallel builds: + # https://github.com/joswr1ght/cowpatty/pull/5 + (fetchpatch { + name = "fix-parallel.patch"; + url = "https://github.com/joswr1ght/cowpatty/commit/9c8cc09c4fa90aebee44afcd0ad6a35539178478.patch"; + hash = "sha256-k0Qht80HcjvPoxVPF6wAXwxN3d2mxBrEyeFGuU7w9eA="; + }) + ]; + nativeBuildInputs = [ clang installShellFiles @@ -28,6 +39,8 @@ stdenv.mkDerivation rec { libpcap ]; + enableParallelBuilding = true; + makeFlags = [ "DESTDIR=$(out)" "BINDIR=/bin" |