From ae01da1bb2de5b28c25ba3a4bb9a425a3d730afc Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Wed, 30 Mar 2022 11:18:00 +0200 Subject: [PATCH] libnet: v1.2-rc3 -> v1.2 --- pkgs/development/libraries/libnet/default.nix | 20 +++++++++---- .../libraries/libnet/fix-includes.patch | 29 ------------------- 2 files changed, 14 insertions(+), 35 deletions(-) delete mode 100644 pkgs/development/libraries/libnet/fix-includes.patch diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index cb3375708df..af3c7f82aef 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -1,15 +1,23 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "libnet"; - version = "1.2-rc3"; + version = "1.2"; - src = fetchurl { - url = "mirror://sourceforge/libnet-dev/${pname}-${version}.tar.gz"; - sha256 = "0qsapqa7dzq9f6lb19kzilif0pj82b64fjv5bq086hflb9w81hvj"; + src = fetchFromGitHub { + owner = "sam-github"; + repo = "libnet"; + rev = "v${version}"; + sha256 = "sha256-Y/wd9c4whUbfpvWvKzJV6vJN3AlA14XBejchRG6wBc4="; }; - patches = [ ./fix-includes.patch ]; + nativeBuildInputs = [ + autoconf + automake + libtool + ]; + + preConfigure = "./autogen.sh"; meta = with lib; { homepage = "https://github.com/sam-github/libnet"; diff --git a/pkgs/development/libraries/libnet/fix-includes.patch b/pkgs/development/libraries/libnet/fix-includes.patch deleted file mode 100644 index 5eb86bc37b7..00000000000 --- a/pkgs/development/libraries/libnet/fix-includes.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- libnet-1.1.6.orig/src/libnet_link_linux.c -+++ libnet-1.1.6/src/libnet_link_linux.c -@@ -30,26 +30,15 @@ - #include - - #include --#if (__GLIBC__) - #include - #include --#else --#include --#include --#endif - - #if (HAVE_PACKET_SOCKET) - #ifndef SOL_PACKET - #define SOL_PACKET 263 - #endif /* SOL_PACKET */ --#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 - #include - #include /* the L2 protocols */ --#else --#include --#include --#include /* The L2 protocols */ --#endif - #endif /* HAVE_PACKET_SOCKET */ - - #include "../include/libnet.h"