diff options
author | freezeboy <freezeboy@users.noreply.github.com> | 2020-11-07 12:39:22 +0100 |
---|---|---|
committer | freezeboy <freezeboy@users.noreply.github.com> | 2020-11-20 22:24:26 +0100 |
commit | e4aa0e093604d38d8c1dd8f4f8590da024a8ac52 (patch) | |
tree | 58b7f91a4d60e6734440f55217279ca061d20c08 /pkgs/applications/networking/ostinato | |
parent | a62425888cca030ffad643f0df695909f281efab (diff) |
ostinato: 0.9 -> 1.1
* Port to Qt5.15 in the process
* Cleanup the derivation to use new style
Diffstat (limited to 'pkgs/applications/networking/ostinato')
-rw-r--r-- | pkgs/applications/networking/ostinato/default.nix | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index aa9d94ad5b6e..3bfb2526232c 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchFromGitHub, fetchurl, qmake4Hook, makeDesktopItem -, qt4, protobuf, libpcap, wireshark, gzip, diffutils, gawk +{ lib, mkDerivation, fetchFromGitHub, fetchurl, qmake, makeDesktopItem +, qtbase, qtscript, protobuf, libpcap, wireshark, gzip, diffutils, gawk +, libnl }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "ostinato"; - version = "0.9"; + version = "1.1"; src = fetchFromGitHub { owner = "pstavirs"; repo = "ostinato"; rev = "v${version}"; - sha256 = "109gxj6djdsk7rp1nxpx39kfi75xfl9p9qgffh1cpcdpbsbvq5bx"; + sha256 = "0B3jOj5rA3/rD2gXS2praZImeP34zN06fOPy/IswXOg="; }; ostinatoIcon = fetchurl { @@ -18,14 +19,17 @@ stdenv.mkDerivation rec { sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70"; }; - buildInputs = [ qt4 protobuf libpcap ]; + buildInputs = [ qtbase protobuf libpcap qtscript libnl ]; - nativeBuildInputs = [ qmake4Hook ]; + nativeBuildInputs = [ qmake ]; patches = [ ./drone_ini.patch ]; + prePatch = '' + sed -i 's|/usr/include/libnl3|${libnl.dev}/include/libnl3|' server/drone.pro + ''; desktopItem = makeDesktopItem { - type = "application"; + type = "Application"; name = "ostinato"; desktopName = "Ostinato"; 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 enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A packet traffic generator and analyzer"; homepage = "https://ostinato.org"; license = licenses.gpl3; |