Unverified Commit a82a9674 authored by Austin Horstman's avatar Austin Horstman Committed by GitHub
Browse files

sniproxy: switch to pcre2 (#437597)

parents 7480dcb4 010eaf6f

pkgs/by-name/sn/sniproxy/package.nix

+11 −2
Original line number Diff line number Diff line
@@ -2,10 +2,11 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchurl,

  autoreconfHook,

  gettext,

  libev,

  pcre,

  pcre2,

  pkg-config,

  udns,

}:
@@ -23,6 +24,14 @@ stdenv.mkDerivation rec { 


  patches = [

    ./gettext-0.25.patch

    (fetchurl {

      name = "compat-pcre2.patch";

      # Using Arch Linux patch because the following upstream patches do not apply cleanly:

      # https://github.com/dlundquist/sniproxy/commit/62e621f050f79eb78598b1296a089ef88a19ea91

      # https://github.com/dlundquist/sniproxy/commit/7fdd86c054a21f7ac62343010de20f28645b14d2

      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/sniproxy/-/raw/3272f9f0d406c51122f90708bfcc7b4ba0eb38c9/sniproxy-0.6.1-pcre2.patch?inline=false";

      hash = "sha256-v6qdBAWXit0Zg43OsgzCTb4cSPm7gsEXVd7W8LvBgMk=";

    })

  ];



  nativeBuildInputs = [
@@ -32,7 +41,7 @@ stdenv.mkDerivation rec { 
  buildInputs = [

    gettext

    libev

    pcre

    pcre2

    udns

  ];