From 89c01366f924b066e284b287eb07168f94716d19 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 24 Mar 2023 18:57:43 +0100 Subject: [PATCH] bustle: Fix build with libpcap 1.10.2 --- .../haskell-modules/configuration-common.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f598758f4a0c..81cedafdf4c5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -621,13 +621,20 @@ self: super: { Euterpea = doJailbreak super.Euterpea; # Install icons, metadata and cli program. - bustle = overrideCabal (drv: { + bustle = appendPatches [ + # Fix build with libpcap 1.10.2 + # https://gitlab.freedesktop.org/bustle/bustle/-/merge_requests/21 + (pkgs.fetchpatch { + url = "https://gitlab.freedesktop.org/bustle/bustle/-/commit/77e2de892cd359f779c84739682431a66eb8cf31.patch"; + hash = "sha256-sPb6/Z/ANids53aL9VsMHa/v5y+TA1ZY3jwAXlEH3Ec="; + }) + ] (overrideCabal (drv: { buildDepends = [ pkgs.libpcap ]; buildTools = with pkgs.buildPackages; [ gettext perl help2man ]; postInstall = '' make install PREFIX=$out ''; - }) super.bustle; + }) super.bustle); # Byte-compile elisp code for Emacs. ghc-mod = overrideCabal (drv: {