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

ostinato: 0.9 -> 1.1

Browse Source 
* Port to Qt5.15 in the process
 * Cleanup the derivation to use new style
This commit is contained in:
freezeboy 2020-11-07 12:39:22 +01:00
parent a62425888c
commit e4aa0e0936
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/networking/ostinato/default.nix
View File

@ -1,16 +1,17 @@
{ stdenv, fetchFromGitHub, fetchurl, qmake4Hook, makeDesktopItem { lib, mkDerivation, fetchFromGitHub, fetchurl, qmake, makeDesktopItem
, qt4, protobuf, libpcap, wireshark, gzip, diffutils, gawk , qtbase, qtscript, protobuf, libpcap, wireshark, gzip, diffutils, gawk
, libnl
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "ostinato"; pname = "ostinato";
version = "0.9"; version = "1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pstavirs"; owner = "pstavirs";
repo = "ostinato"; repo = "ostinato";
rev = "v${version}"; rev = "v${version}";
sha256 = "109gxj6djdsk7rp1nxpx39kfi75xfl9p9qgffh1cpcdpbsbvq5bx"; sha256 = "0B3jOj5rA3/rD2gXS2praZImeP34zN06fOPy/IswXOg=";
}; };
ostinatoIcon = fetchurl { ostinatoIcon = fetchurl {
@ -18,14 +19,17 @@ stdenv.mkDerivation rec {
sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70"; sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70";
}; };
buildInputs = [ qt4 protobuf libpcap ]; buildInputs = [ qtbase protobuf libpcap qtscript libnl ];
nativeBuildInputs = [ qmake4Hook ]; nativeBuildInputs = [ qmake ];
patches = [ ./drone_ini.patch ]; patches = [ ./drone_ini.patch ];
prePatch = ''
sed -i 's|/usr/include/libnl3|${libnl.dev}/include/libnl3|' server/drone.pro
'';
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
type = "application"; type = "Application";
name = "ostinato"; name = "ostinato";
desktopName = "Ostinato"; desktopName = "Ostinato";
genericName = "Packet/Traffic Generator and Analyzer"; genericName = "Packet/Traffic Generator and Analyzer";
@ -58,7 +62,7 @@ stdenv.mkDerivation rec {
# pdmlprotocol.h:23:25: fatal error: protocol.pb.h: No such file or directory # pdmlprotocol.h:23:25: fatal error: protocol.pb.h: No such file or directory
enableParallelBuilding = false; enableParallelBuilding = false;
meta = with stdenv.lib; { meta = with lib; {
description = "A packet traffic generator and analyzer"; description = "A packet traffic generator and analyzer";
homepage = "https://ostinato.org"; homepage = "https://ostinato.org";
license = licenses.gpl3; license = licenses.gpl3;

4
pkgs/top-level/all-packages.nix
View File

@ -22613,9 +22613,7 @@ in
osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; osm2pgsql = callPackage ../tools/misc/osm2pgsql { };
ostinato = callPackage ../applications/networking/ostinato { ostinato = libsForQt5.callPackage ../applications/networking/ostinato { };
wireshark = wireshark.override { qt5 = qt514; };
};
p4 = callPackage ../applications/version-management/p4 { }; p4 = callPackage ../applications/version-management/p4 { };
# Broken with Qt5.15 because qtwebkit is broken with it # Broken with Qt5.15 because qtwebkit is broken with it