From ace41329a55baca40cb4c4baccd19670cdaa65c7 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 15 Jul 2023 12:08:53 +0200 Subject: [PATCH] haskellPackages.{gtk,gio}: Use established workaround --- .../development/haskell-modules/configuration-ghc-9.4.x.nix | 5 ++--- pkgs/development/haskell-modules/configuration-nix.nix | 6 ------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 22cbba982f66..6aadbfe97f1a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -187,10 +187,9 @@ in { haskell-gi-base = __CabalEagerPkgConfigWorkaround super.haskell-gi-base; svgcairo = __CabalEagerPkgConfigWorkaround super.svgcairo; gtk3 = __CabalEagerPkgConfigWorkaround super.gtk3; + gio = __CabalEagerPkgConfigWorkaround super.gio; + gtk = __CabalEagerPkgConfigWorkaround super.gtk; # Cabal 3.8 bug workaround for applications using haskell-gi family of libraries termonad = __CabalEagerPkgConfigWorkaround super.termonad; - - # Pending text-2.0 support https://github.com/gtk2hs/gtk2hs/issues/327 - gtk = doJailbreak super.gtk; } diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a0cfa8279515..1c3c7ead1506 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -323,18 +323,12 @@ self: super: builtins.intersectAttrs super { gio = lib.pipe super.gio [ (disableHardening ["fortify"]) (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools) - (addPkgconfigDepends (with pkgs; [ glib pcre2 pcre ] - ++ lib.optionals pkgs.stdenv.isLinux [ util-linux libselinux libsepol ])) ]; glib = disableHardening ["fortify"] (addPkgconfigDepend pkgs.glib (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.glib)); gtk3 = disableHardening ["fortify"] (super.gtk3.override { inherit (pkgs) gtk3; }); gtk = lib.pipe super.gtk ( [ (disableHardening ["fortify"]) (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools) - (addPkgconfigDepends (with pkgs; [ gtk2 pcre2 pcre fribidi - libthai libdatrie xorg.libXdmcp libdeflate - ] - ++ lib.optionals pkgs.stdenv.isLinux [ util-linux libselinux libsepol ])) ] ++ ( if pkgs.stdenv.isDarwin then [(appendConfigureFlag "-fhave-quartz-gtk")] else [] ) );