From 8e5d5bac2ec91fa4c019bb8d686373c90a1b1830 Mon Sep 17 00:00:00 2001 From: Robert Djubek Date: Sun, 19 Jan 2020 15:19:57 +0000 Subject: [PATCH] glirc: 2.33.1 -> 2.34 Really this is a fix of the build because of the automatic version bump --- .../haskell-modules/configuration-common.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5605af97ddcf..8d7d2fbfd8fe 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1337,7 +1337,15 @@ self: super: { # 2019-12-19 - glirc wants regex-tdfa >=1.3 which results in errors with regex-base which errors more # hoping to make a proper derivation with plugins enabled and more reliable building -- kiwi - glirc = doJailbreak super.glirc; + # 2020-01-17 - as of recently the basic doJailbreak is not enough and have to override regex-tdfa which needs an override for regex-base + + glirc = doJailbreak (super.glirc.override { + regex-tdfa = self.regex-tdfa_1_3_1_0; + }); + + regex-tdfa_1_3_1_0 = doJailbreak (super.regex-tdfa_1_3_1_0.override { + regex-base = self.regex-base_0_94_0_0; + }); # apply patches from https://github.com/snapframework/snap-server/pull/126 # manually until they are accepted upstream