diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-10-14 22:27:10 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-10-14 22:29:24 +0100 |
| commit | 80da54afc13733eeae58982c16a1335978f59659 (patch) | |
| tree | b27144fb458143d5924fcc6c8b0fa83847778419 | |
| parent | 398ac823a115d87bce3ea84787d5f1cd856f1b7a (diff) | |
| download | nixlib-80da54afc13733eeae58982c16a1335978f59659.tar nixlib-80da54afc13733eeae58982c16a1335978f59659.tar.gz nixlib-80da54afc13733eeae58982c16a1335978f59659.tar.bz2 nixlib-80da54afc13733eeae58982c16a1335978f59659.tar.lz nixlib-80da54afc13733eeae58982c16a1335978f59659.tar.xz nixlib-80da54afc13733eeae58982c16a1335978f59659.tar.zst nixlib-80da54afc13733eeae58982c16a1335978f59659.zip | |
cowpatty: backport parallel build fix
Without the change parallel build fails as:
cowpatty> clang -pipe -Wall -DOPENSSL -O2 -g3 -ggdb genpmk.c -o genpmk utils.o sha1.o -lpcap -lcrypto
cowpatty> clang-11clang-11: : errorerror: no such file or directory: 'utils.o'
cowpatty> : no such file or directory: 'utils.o'
| -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" |