From eef236d0ba205b061972d55926a45b593a4c3d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 27 Aug 2017 17:21:35 +0200 Subject: [PATCH] libsigsegv*: add an option to apply a patch Close #28536; this code is a bit different in style for 2.5, and avoids mass rebuild for the default version. --- pkgs/development/libraries/libsigsegv/2.5.nix | 6 +++++- pkgs/development/libraries/libsigsegv/default.nix | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libsigsegv/2.5.nix b/pkgs/development/libraries/libsigsegv/2.5.nix index 0712ba92f60a..fd453defe713 100644 --- a/pkgs/development/libraries/libsigsegv/2.5.nix +++ b/pkgs/development/libraries/libsigsegv/2.5.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl +, enableSigbusFix ? false # required by kernels < 3.18.6 +}: stdenv.mkDerivation rec { name = "libsigsegv-2.5"; @@ -8,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0fvcsq9msi63vrbpvks6mqkrnls5cfy6bzww063sqhk2h49vsyyg"; }; + patches = stdenv.lib.optional enableSigbusFix ./sigbus_fix.patch; + meta = { homepage = http://libsigsegv.sf.net; description = "A library for handling page faults in user mode"; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 961b3b2d883b..8e1079bfbc8a 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl , buildPlatform, hostPlatform +, enableSigbusFix ? false # required by kernels < 3.18.6 }: stdenv.mkDerivation rec { @@ -10,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x"; }; + patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null; + doCheck = hostPlatform == buildPlatform; meta = {