diff options
| author | Rodney Lorrimar <dev@rodney.id.au> | 2024-02-09 14:10:03 +0800 |
|---|---|---|
| committer | Rodney Lorrimar <dev@rodney.id.au> | 2024-02-10 16:55:55 +0800 |
| commit | 5ae2fba1b126071801d17a5ae14e952b08832177 (patch) | |
| tree | aa4e8f9cf2a9a9bd21db4c6b722cc53f0df52718 /pkgs/development/haskell-modules | |
| parent | 63f3a9268c2d9142b3908a75d594b7082bf55dfc (diff) | |
| download | nixlib-5ae2fba1b126071801d17a5ae14e952b08832177.tar nixlib-5ae2fba1b126071801d17a5ae14e952b08832177.tar.gz nixlib-5ae2fba1b126071801d17a5ae14e952b08832177.tar.bz2 nixlib-5ae2fba1b126071801d17a5ae14e952b08832177.tar.lz nixlib-5ae2fba1b126071801d17a5ae14e952b08832177.tar.xz nixlib-5ae2fba1b126071801d17a5ae14e952b08832177.tar.zst nixlib-5ae2fba1b126071801d17a5ae14e952b08832177.zip | |
haskellPackages.gi-gtk_4: Build fixes
Diffstat (limited to 'pkgs/development/haskell-modules')
3 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 441abe4789c4..b8f60c3b3cc8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2220,6 +2220,17 @@ self: super: { gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; + gi-gtk_4 = self.gi-gtk_4_0_8; + gi-gtk_4_0_8 = doDistribute (super.gi-gtk_4_0_8.override { + gi-gdk = self.gi-gdk_4; + }); + gi-gdk_4 = self.gi-gdk_4_0_7; + gi-gdk_4_0_7 = doDistribute super.gi-gdk_4_0_7; + # GSK is only used for GTK 4. + gi-gsk = super.gi-gsk.override { + gi-gdk = self.gi-gdk_4; + }; + # Missing dependency on gi-cairo # https://github.com/haskell-gi/haskell-gi/pull/420 gi-vte = diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 5ab0290bbed6..2f31cd4af852 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1868,7 +1868,6 @@ broken-packages: - gi-coglpango # failure in job https://hydra.nixos.org/build/233194401 at 2023-09-02 - Gifcurry # failure in job https://hydra.nixos.org/build/233200204 at 2023-09-02 - gi-gio-hs-list-model # failure in job https://hydra.nixos.org/build/233241640 at 2023-09-02 - - gi-gsk # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/239849990 at 2023-11-10 - gi-gsttag # failure in job https://hydra.nixos.org/build/233197576 at 2023-09-02 - gi-gtk-declarative # failure in job https://hydra.nixos.org/build/233217494 at 2023-09-02 - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c0a2d4c59542..bd91a4a83d8b 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1358,6 +1358,9 @@ self: super: builtins.intersectAttrs super { webkit2gtk3-javascriptcore gi-webkit2 gi-webkit2webextension + gi-gtk_4_0_8 + gi-gdk_4_0_7 + gi-gsk ; # Makes the mpi-hs package respect the choice of mpi implementation in Nixpkgs. |