From ded8dc1c46d03353f3a78e772f8f3f869ac9b708 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Thu, 3 Dec 2020 15:02:50 +0100
Subject: [PATCH 1/4] gatling: 0.15 -> 0.16, libowfat: drop patch for header
 location

---
 pkgs/development/libraries/libowfat/default.nix | 11 -----------
 pkgs/servers/http/gatling/default.nix           |  8 ++++----
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix
index 5f434a7ae75..06871158609 100644
--- a/pkgs/development/libraries/libowfat/default.nix
+++ b/pkgs/development/libraries/libowfat/default.nix
@@ -8,17 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "1hcqg7pvy093bxx8wk7i4gvbmgnxz2grxpyy7b4mphidjbcv7fgl";
   };
 
-  # Dirty patch because 0.32 "moved headers to <libowfat/> upon install"
-  # but it breaks gatling-0.15 and opentracker-2018-05-26 ...
-  postPatch = ''
-    substituteInPlace GNUmakefile --replace \
-      'install -d $(DESTDIR)$(INCLUDEDIR)/libowfat' \
-      'install -d $(DESTDIR)$(INCLUDEDIR)'
-    substituteInPlace GNUmakefile --replace \
-      'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)/libowfat' \
-      'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)'
-  '';
-
   makeFlags = [ "prefix=$(out)" ];
   enableParallelBuilding = true;
 
diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix
index 9157c09cbeb..0c095c55e97 100644
--- a/pkgs/servers/http/gatling/default.nix
+++ b/pkgs/servers/http/gatling/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, libowfat, zlib, openssl }:
+{ stdenv, fetchurl, libowfat, libcap, zlib, openssl }:
 
 let
-  version = "0.15";
+  version = "0.16";
 in
 stdenv.mkDerivation rec {
   pname = "gatling";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://www.fefe.de/gatling/${pname}-${version}.tar.xz";
-    sha256 = "194srqyja3pczpbl6l169zlvx179v7ln0m6yipmhvj6hrv82k8vg";
+    sha256 = "0nrnws5qrl4frqcsfa9z973vv5mifgr9z170qbvg3mq1wa7475jz";
   };
 
-  buildInputs = [  libowfat zlib openssl.dev ];
+  buildInputs = [ libowfat libcap zlib openssl.dev ];
 
   configurePhase = ''
     substituteInPlace Makefile --replace "/usr/local" "$out"

From c494e2799966fc678d988e135fa833b2d920445d Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Thu, 3 Dec 2020 15:21:54 +0100
Subject: [PATCH 2/4] opentracker: fix build for libowfat 0.32

---
 pkgs/applications/networking/p2p/opentracker/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix
index 82480b1ed21..581560ae78b 100644
--- a/pkgs/applications/networking/p2p/opentracker/default.nix
+++ b/pkgs/applications/networking/p2p/opentracker/default.nix
@@ -11,6 +11,15 @@ stdenv.mkDerivation {
 
   buildInputs = [ libowfat zlib ];
 
+  postPatch = ''
+    substituteInPlace Makefile --replace \
+      'LIBOWFAT_HEADERS=$(PREFIX)/libowfat' \
+      'LIBOWFAT_HEADERS=${libowfat}/include/libowfat'
+    substituteInPlace Makefile --replace \
+      'LIBOWFAT_LIBRARY=$(PREFIX)/libowfat' \
+      'LIBOWFAT_LIBRARY=${libowfat}/lib'
+  '';
+
   installPhase = ''
     runHook preInstall
     install -D opentracker $out/bin/opentracker

From 3e27c4662a9508ad7a9173f2c0af9dcf21a1c922 Mon Sep 17 00:00:00 2001
From: Markus Wamser <wamserma@users.noreply.github.com>
Date: Fri, 4 Dec 2020 16:16:10 +0100
Subject: [PATCH 3/4] opentracker: combine calls to substituteInPlace
 (refactoring)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/applications/networking/p2p/opentracker/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix
index 581560ae78b..8f63f27cf4d 100644
--- a/pkgs/applications/networking/p2p/opentracker/default.nix
+++ b/pkgs/applications/networking/p2p/opentracker/default.nix
@@ -12,12 +12,9 @@ stdenv.mkDerivation {
   buildInputs = [ libowfat zlib ];
 
   postPatch = ''
-    substituteInPlace Makefile --replace \
-      'LIBOWFAT_HEADERS=$(PREFIX)/libowfat' \
-      'LIBOWFAT_HEADERS=${libowfat}/include/libowfat'
-    substituteInPlace Makefile --replace \
-      'LIBOWFAT_LIBRARY=$(PREFIX)/libowfat' \
-      'LIBOWFAT_LIBRARY=${libowfat}/lib'
+    substituteInPlace Makefile \
+      --replace 'LIBOWFAT_HEADERS=$(PREFIX)/libowfat' 'LIBOWFAT_HEADERS=${libowfat}/include/libowfat' \
+      --replace 'LIBOWFAT_LIBRARY=$(PREFIX)/libowfat' 'LIBOWFAT_LIBRARY=${libowfat}/lib'
   '';
 
   installPhase = ''

From 717beb92fa7e41671d46b3c42b7c369bd282f928 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Mon, 7 Dec 2020 23:46:43 +0100
Subject: [PATCH 4/4] opentracker: use makeFlags instead of patching
 (refactoring)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Mic92 (Jörg Thalheim)
---
 pkgs/applications/networking/p2p/opentracker/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix
index 8f63f27cf4d..8beb2f7d377 100644
--- a/pkgs/applications/networking/p2p/opentracker/default.nix
+++ b/pkgs/applications/networking/p2p/opentracker/default.nix
@@ -11,11 +11,10 @@ stdenv.mkDerivation {
 
   buildInputs = [ libowfat zlib ];
 
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace 'LIBOWFAT_HEADERS=$(PREFIX)/libowfat' 'LIBOWFAT_HEADERS=${libowfat}/include/libowfat' \
-      --replace 'LIBOWFAT_LIBRARY=$(PREFIX)/libowfat' 'LIBOWFAT_LIBRARY=${libowfat}/lib'
-  '';
+  makeFlags = [
+    "LIBOWFAT_HEADERS=${libowfat}/include/libowfat"
+    "LIBOWFAT_LIBRARY=${libowfat}/lib"
+  ];
 
   installPhase = ''
     runHook preInstall