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

gatling: 0.15 -> 0.16, libowfat: drop patch for header location

Browse Source
This commit is contained in:
Markus S. Wamser 2020-12-03 15:02:50 +01:00
parent 209bdc8ddf
commit ded8dc1c46
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/libowfat/default.nix
View File

@ -8,17 +8,6 @@ stdenv.mkDerivation rec {
sha256 = "1hcqg7pvy093bxx8wk7i4gvbmgnxz2grxpyy7b4mphidjbcv7fgl"; 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)" ]; makeFlags = [ "prefix=$(out)" ];
enableParallelBuilding = true; enableParallelBuilding = true;

8
pkgs/servers/http/gatling/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, libowfat, zlib, openssl }: { stdenv, fetchurl, libowfat, libcap, zlib, openssl }:
let let
version = "0.15"; version = "0.16";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gatling"; pname = "gatling";
@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://www.fefe.de/gatling/${pname}-${version}.tar.xz"; 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 = '' configurePhase = ''
substituteInPlace Makefile --replace "/usr/local" "$out" substituteInPlace Makefile --replace "/usr/local" "$out"