diff options
| author | Dennis Gosnell <cdep.illabout@gmail.com> | 2023-12-27 09:58:13 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-27 09:58:13 +0900 |
| commit | b2e27ff5316260759d3b36d579710664ec38f0c2 (patch) | |
| tree | 8834c523cc5237795f50b4458c91b1d0a562f89e | |
| parent | d4c7b50784e68d628df8e0c01f03a494616f89c7 (diff) | |
| parent | 9a00eb12503d9e5eac895c2eae16006f8f0b625f (diff) | |
| download | nixlib-b2e27ff5316260759d3b36d579710664ec38f0c2.tar nixlib-b2e27ff5316260759d3b36d579710664ec38f0c2.tar.gz nixlib-b2e27ff5316260759d3b36d579710664ec38f0c2.tar.bz2 nixlib-b2e27ff5316260759d3b36d579710664ec38f0c2.tar.lz nixlib-b2e27ff5316260759d3b36d579710664ec38f0c2.tar.xz nixlib-b2e27ff5316260759d3b36d579710664ec38f0c2.tar.zst nixlib-b2e27ff5316260759d3b36d579710664ec38f0c2.zip | |
Merge pull request #277010 from cdepillabout/fix-gi-vte
haskellPackages.gi-vte: fix by adding missing gi-cairo dep
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 97ece05b508b..7c3e26c96528 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2186,6 +2186,22 @@ self: super: { gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; + # Missing dependency on gi-cairo + # https://github.com/haskell-gi/haskell-gi/pull/420 + gi-vte = + overrideCabal + (oldAttrs: { + # This is implemented as a sed expression instead of pulling a patch + # from upstream because the gi-vte repo doesn't actually contain a + # gi-vte.cabal file. The gi-vte.cabal file is generated from metadata + # in the repo. + postPatch = (oldAttrs.postPatch or "") + '' + sed -i 's/\(gi-gtk == .*\),/\1, gi-cairo == 1.0.*,/' ./gi-vte.cabal + ''; + buildDepends = (oldAttrs.buildDepends or []) ++ [self.gi-cairo]; + }) + super.gi-vte; + # 2023-04-09: haskell-ci needs Cabal-syntax 3.10 # 2023-07-03: allow lattices-2.2, waiting on https://github.com/haskell-CI/haskell-ci/pull/664 haskell-ci = doJailbreak (super.haskell-ci.overrideScope (self: super: { |