Skip to content

Instantly share code, notes, and snippets.

@Kiwi

Kiwi/git.diff Secret

Created January 18, 2020 05:12
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Kiwi/35a09c7df9723e0e00941f162872455f to your computer and use it in GitHub Desktop.
Save Kiwi/35a09c7df9723e0e00941f162872455f to your computer and use it in GitHub Desktop.
git diff of an update to glirc to make it build again on nixos-unstable
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5605af97ddc..32e0f6e6218 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1337,7 +1337,13 @@ 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 = 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment